Merge branch 'stash'
commit6f6c8b73b762a9c110b894d2a175488070de92bb
authorSven Strickroth <email@cs-ware.de>
Fri, 2 Dec 2011 23:27:14 +0000 (3 00:27 +0100)
committerSven Strickroth <email@cs-ware.de>
Fri, 2 Dec 2011 23:27:14 +0000 (3 00:27 +0100)
tree33f39512b3f81feb7e9fb113c8ee34b901a1bea0
parenta7d1c71368f0ff82e69dc975761df0a94e2bc128
parent52b24416b2fae3add8a53a397aaa5f59a01dc03b
Merge branch 'stash'