Merge branch 'bug-1198' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 25 Aug 2013 18:56:36 +0000 (20:56 +0200)
committerMichael Tänzer <neo@nhng.de>
Sun, 25 Aug 2013 18:56:36 +0000 (20:56 +0200)
commit32bf5ece566116fe1f9eb0ee88b8e8e6cbe27f97
tree0e93a7530e13be3bff51547b39a642357bf0fd65
parente40fba184192384eb46ba9f9a2fc7f513e339067
parent4e171644263dda59be0c652eaa17514cab0a0612
Merge branch 'bug-1198' into release