Merge branch 'bug-1297' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 20 Aug 2014 20:34:25 +0000 (22:34 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 20 Aug 2014 20:34:25 +0000 (22:34 +0200)
commitf7509bc9a6a2bcc1cae277d159aed71d6a0049c3
tree64608aa5b791333407ce6e1a1e238890d51c1e19
parent113e61529e3192197203a7acb3a73019fd251de1
parent061fec271f164c0efb356d98b5b4f640ed3c6c2f
Merge branch 'bug-1297' into release
includes/lib/check_weak_key.php