Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Sat, 16 Mar 2013 17:49:14 +0000 (18:49 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 16 Mar 2013 17:49:14 +0000 (18:49 +0100)
commitc05e0d15b627362d1c7a1689b50b2a7e320f33f2
tree9020a9fcee78cba5c86381f895fc7d43ced1aa42
parentd673397d773c92d5dff95be35ee238b7d33a567c
parentaf03b21a6b3b3746600609f1884609c8d809b7f8
Merge 0.9->trunk