Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Fri, 29 Jun 2012 19:44:50 +0000 (21:44 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 29 Jun 2012 19:44:50 +0000 (21:44 +0200)
commitbf2d3a835690697eafc5f6ec8fda9a0dcb34a42f
tree2fdfced938ff35557287aac3f5d9b50697474781
parent466c65592aa2a18ab06f070f840a0acbdd978444
parent02f12234f19d159a42f554439a90928883fb1b00
Merge remote branch 'upstream/master'