Merge branch 'hotfix/3.6.1'
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 5 Jun 2015 16:16:56 +0000 (18:16 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 5 Jun 2015 16:16:56 +0000 (18:16 +0200)
commit7e5b1513e55626aac1aff255c101017c69b9cf85
tree93a0c9ccc52c60b96e305a011c2a524d2d0a9f55
parent491389ea2cea2ca5e6f007e38235700b13cb2bf0
parent0c924c07d0b88260eaad78a8ebd23d78f3923d04
Merge branch 'hotfix/3.6.1'