Merge branch 'bug-940' into release
authorMichael Tänzer <neo@nhng.de>
Thu, 24 Nov 2011 16:17:30 +0000 (17:17 +0100)
committerMichael Tänzer <neo@nhng.de>
Thu, 24 Nov 2011 16:17:30 +0000 (17:17 +0100)
commit449ead41843d4b508cf8964234ad6a8e7c8161fb
tree3cb869dde69bbdba0d90692e6dfb4ce4add2c296
parent8ce107ef51d6fd9618d4275b6bca16678aa6bc75
parent8e8179f00930a29cd9c1eab059cc8ef222b29384
Merge branch 'bug-940' into release