Merge branch 'master' into 1.9
authorthomasv <thomasv@gitorious>
Wed, 4 Sep 2013 15:11:41 +0000 (17:11 +0200)
committerthomasv <thomasv@gitorious>
Wed, 4 Sep 2013 15:11:41 +0000 (17:11 +0200)
commit075a1d13c518a3ca047ba062f38f31f8bb44a786
tree00676aa0ebc2e7af6ea9c0656df64cf97d4ed838
parentafac84e231c424dbf2dc9588196114aec37f3f82
parentaf8a7aa6f01ad23d04bbd411b20ffe7dfe622dad
Merge branch 'master' into 1.9