Merge remote-tracking branch 'upstream/master'
authorConstantin Wenger <constantin.wenger@googlemail.com>
Fri, 22 Jul 2011 18:53:29 +0000 (20:53 +0200)
committerConstantin Wenger <constantin.wenger@googlemail.com>
Fri, 22 Jul 2011 18:53:29 +0000 (20:53 +0200)
commit383698186f954f52b8a957ef741175c437bf2502
treef56ab1050d20d24cccaf830f3029193d025edf21
parentfb4c3ab4fbd29498a72a488199be58ead7505cc7
parent7985d746f97ce1b37b6ca48a8a3e7ed70d02e4b0
Merge remote-tracking branch 'upstream/master'