Merge branch 'merge-bug-1177-893-1136-1123-1137' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 6 Sep 2013 03:40:36 +0000 (05:40 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 6 Sep 2013 03:40:36 +0000 (05:40 +0200)
commit18a9f2205edaaf42ab15f48c2165c31883bba8e5
tree2d68fc0f549cb1b7c1fd9ba087ee0e74c9e49ec9
parent0b92c4652f949b0a795e15064efe9f41c1eca769
parent24603f28cde091813d8022daa9153eb4ab685ca4
Merge branch 'merge-bug-1177-893-1136-1123-1137' into release

Conflicts:
www/gpg.php
www/gpg.php