Merge remote-tracking branch 'origin/bug-1318' into release
authorMichael Tänzer <neo@nhng.de>
Fri, 5 Dec 2014 00:11:53 +0000 (01:11 +0100)
committerMichael Tänzer <neo@nhng.de>
Fri, 5 Dec 2014 00:11:53 +0000 (01:11 +0100)
commit9e373f974a28e3573a419a069bfeb8ce2503f69d
tree1839642949e572469e8526a7bf519a5303da182e
parent86c04b83870dc547fdcef25f91b1bc3b1de53619
parentb388a866c926be68aeb5a9e5bb28b364fa39ad86
Merge remote-tracking branch 'origin/bug-1318' into release
includes/general.php