Merge branch 'bug-1024' into release
authorMichael Tänzer <neo@nhng.de>
Fri, 10 Aug 2012 11:47:11 +0000 (13:47 +0200)
committerMichael Tänzer <neo@nhng.de>
Fri, 10 Aug 2012 11:47:11 +0000 (13:47 +0200)
commit9980ce2f4458dd6957aaa81fe84f1be6be80a508
tree6624b2c5d8caeebff9ada83fc93492b1aa3a7277
parentaee0b3040b04332a7dd95dfe26aebb70b7129873
parent7a3e7c10d30b59a6de4d2acad1fb345dbce4f4d5
Merge branch 'bug-1024' into release