Merge remote-tracking branch 'origin/bug-1239' into release
authorMichael Tänzer <neo@nhng.de>
Fri, 21 Mar 2014 17:48:04 +0000 (18:48 +0100)
committerMichael Tänzer <neo@nhng.de>
Fri, 21 Mar 2014 17:48:04 +0000 (18:48 +0100)
1  2 
pages/index/1.php

Simple merge