Merge commit 'c5518de'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 10 Dec 2010 23:43:32 +0000 (00:43 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 10 Dec 2010 23:43:32 +0000 (00:43 +0100)
commit97273c1f32ca88759eece730a32967d690b06a62
tree9d4742bb022cdc68317ed77a1ee624f9f26369aa
parent0a5f730751cf4a7f6ce555ef920fe9fdcd8e59ac
parentc5518de0a234d66fee8b8be864045464f5192017
Merge commit 'c5518de'