Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Fri, 25 May 2012 14:19:32 +0000 (16:19 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 25 May 2012 14:19:32 +0000 (16:19 +0200)
commit54ece4f4841e5df54822ca3c91e7139757462a5f
tree1a4b454ef9451e48a7d3d1b2b8e7c6a70ec2ec64
parentd87e6982f986027e681ec18c13afc30807a09908
parent6f37cb01a99707f8d58603ca19ad64d27bc0d0f3
Merge remote branch 'upstream/master'