Merge remote-tracking branch 'origin/bug-1064' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 20 Nov 2013 12:58:15 +0000 (13:58 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 20 Nov 2013 12:58:15 +0000 (13:58 +0100)
commit4fdc024a9215ab3008b281ffabbd7924f19778b3
tree071a7d97bffac83ac93c16e02a0edc8fd4b3f52c
parentfcad1f4ad86a5aa5c3a73e1aa6ef4c0349678cbd
parent8da571bb3cecda0041cdbc79fc60648037fcb03a
Merge remote-tracking branch 'origin/bug-1064' into release