Merge remote-tracking branch 'origin/master' into 0.11
authorEdward Hervey <bilboed@bilboed.com>
Wed, 21 Sep 2011 11:42:58 +0000 (13:42 +0200)
committerEdward Hervey <bilboed@bilboed.com>
Wed, 21 Sep 2011 11:42:58 +0000 (13:42 +0200)
commit0546e5881d1ec7137c71d35247729e28c1a4ab66
tree8f2406812664b12ad2b19575d74862f4730d7053
parent50b34abb468b6572a92f6700552f6f541c655be8
parenta3d46d170d792024827f403ed663bb61140e985c
Merge remote-tracking branch 'origin/master' into 0.11