Merge pull request #798 from bjornerik/fix/nestedshortcodes
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Fri, 16 Jan 2015 10:06:17 +0000 (11:06 +0100)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Fri, 16 Jan 2015 10:06:17 +0000 (11:06 +0100)
Fix issue with nested shortcodes


Trivial merge