Merge 0.9 -> trunk
authorKim Alvefur <zash@zash.se>
Sun, 11 Nov 2012 22:48:38 +0000 (23:48 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 11 Nov 2012 22:48:38 +0000 (23:48 +0100)
commitf56accde08bf0e3d878df0028006a59fc4735730
treef796e0b24d0676991d6022836e2a32fdd2691392
parent8b16fab249d501376ab671c88e102b78d1016e35
parent911d214081a582be72fcdc81eaba43ce6ea96ebe
Merge 0.9 -> trunk