Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 23 Jun 2012 10:54:10 +0000 (12:54 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 23 Jun 2012 10:54:10 +0000 (12:54 +0200)
commit466c65592aa2a18ab06f070f840a0acbdd978444
tree0f75cd649fc4da226dd1c92dab4a504ba84045ec
parent471b5db36feedc9c71ab862a7c35478633bebfa9
parenta60d66c70ae165282ec7851c1c89176e2c7dc99e
Merge remote branch 'upstream/master'