Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Sun, 16 Dec 2012 13:36:44 +0000 (14:36 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 16 Dec 2012 13:36:44 +0000 (14:36 +0100)
commit06f6e42b5a278638daaa22d007dac1733ec3901f
tree815dee18cd01983eaea3339a8887b6c474fc2189
parent484a4545c5d0e3b7f7612093fdb57a06f6d17e59
parente39ca2e18703f75cb1524f40b14d19c55d9c41a3
Merge 0.9->trunk