Merge remote-tracking branch 'origin/bug-1257' into release
authorMichael Tänzer <neo@nhng.de>
Fri, 21 Mar 2014 18:00:52 +0000 (19:00 +0100)
committerMichael Tänzer <neo@nhng.de>
Fri, 21 Mar 2014 18:00:52 +0000 (19:00 +0100)
commit0dce65277b99950ddbd34965d403dcac3fe0083e
treeecf39ceeda199ee6d0ffe201fa828e85fefc2629
parent66dbbfb9e7fbfff21726027bbd5c47caf286cea2
parent2ed183056d6a8c911af1c38afd1b3c0ca3801b0e
Merge remote-tracking branch 'origin/bug-1257' into release