Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 15 Jul 2012 15:24:41 +0000 (17:24 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 15 Jul 2012 15:24:41 +0000 (17:24 +0200)
commitc460ff6348fc2f3944f8eb4e7af1d74cba06c236
treefcdbb8c2fb41e33d3c8931b366e2d4d4a94aa042
parent341de3e5babdfa34ef8514bc03618a9978386fda
parent8e06a841ade07adcb2960813d11c535e95505fa9
Merge remote branch 'upstream/master'