Merge branch 'release' into bug-1138
authorBenny Baumann <BenBE@geshi.org>
Sat, 11 Jan 2014 19:10:03 +0000 (20:10 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 11 Jan 2014 19:10:03 +0000 (20:10 +0100)
commit499b1281956490bb2f4d243e3b04686444a79816
tree4b1ca507fc69f5bba36de9fdd580b2df515598f7
parent39f4aa38f6b1cbbf3f8593420b42c0a30badc3d4
parentbeef667c8fc1dd6e41807732358174832d801ecf
Merge branch 'release' into bug-1138

Conflicts:
www/styles/default.css
includes/account.php
includes/notary.inc.php
pages/account/43.php
www/styles/default.css