Merge remote-tracking branch 'origin/bug-1114' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 9 Dec 2012 23:08:33 +0000 (00:08 +0100)
committerMichael Tänzer <neo@nhng.de>
Sun, 9 Dec 2012 23:08:33 +0000 (00:08 +0100)
commitee8f25df194afec37acef984b9e1471ad1671658
tree9aa2a51840af7a7709dbe9327d9f20f50c0f59f3
parent2f4fec0ca0ad646e595e30e9761be4c36d02cbb7
parentc1fed4ce8bb0a08d1cba6ba0a95a4ecd3eff6ddb
Merge remote-tracking branch 'origin/bug-1114' into release