Merge remote-tracking branch 'jnovack/markdown'
authorChristian Weiske <cweiske@cweiske.de>
Tue, 18 Sep 2012 22:10:19 +0000 (00:10 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Tue, 18 Sep 2012 22:10:19 +0000 (00:10 +0200)
commit027c801a4dc51db673bcbfcfbd396845f244e357
tree4be2941bd3d92d7cd1f07b61fd3c072b0007abe3
parent72dac890a041b8261262c7df7d7f8a8a816a146b
parentd316adab970b993504ba38736a0f8753ef4bb052
Merge remote-tracking branch 'jnovack/markdown'

Conflicts:
ChangeLog
ChangeLog
README.rst
data/config.default.php