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)
commit2abe6ed75c22a0cb3154043446100baab01624fd
tree1fce6995e63b1913c628c4ead34b6feb6686bf35
parenta12229f27148b9aec64c0fdeb1d739ad2062ac93
parent805ccd449fdd62e05083b71c1e035e5e7347c73a
Merge remote-tracking branch 'upstream/master'