Merge branch 'release' into testserver-stable
authorMichael Tänzer <neo@nhng.de>
Thu, 16 Oct 2014 20:08:29 +0000 (22:08 +0200)
committerMichael Tänzer <neo@nhng.de>
Thu, 16 Oct 2014 20:08:29 +0000 (22:08 +0200)
commit00c3bbd5944d976ddb17a3bb024fdebb142b3141
tree0a1b4a62a02f51e0794d47b42afde6d77062da54
parente96fb125dbc8809c048f63ed9034ef975dc32d1f
parentfb720bf477205d505c37a47eb29b965a4dcc2b04
Merge branch 'release' into testserver-stable