Merge branch 'release' into bug-1138
authorMichael Tänzer <neo@nhng.de>
Mon, 24 Mar 2014 14:03:15 +0000 (15:03 +0100)
committerMichael Tänzer <neo@nhng.de>
Mon, 24 Mar 2014 14:03:15 +0000 (15:03 +0100)
commit775f07428a55a7466258efe32627b600862309e4
tree666b4bf2f4e3d3ffd524a36a581ddc5831b07750
parentb97cf0e899dcdf027b04092e14130ac0e49ea348
parent0d791f450e65657cfd615471cf31dfc0ba5d9b37
Merge branch 'release' into bug-1138
includes/account.php