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)
commit3a9300ddc4f73bd4a3b29d16c0107b6bd1439632
tree2929474fe4e2f83d2c91b6cf1c934c1fd21f6d61
parent1cbdd3e59df6c4513ea8e83aadc969272420ca52
parent714abd5ce0be9fc1ae6b3f4026eb75fcd3ff0948
Merge pull request #798 from bjornerik/fix/nestedshortcodes

Fix issue with nested shortcodes