merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 12 Oct 2013 07:52:12 +0000 (09:52 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 12 Oct 2013 07:52:12 +0000 (09:52 +0200)
commitf94ad59754a0f0b1cef4a334b988a21392a738c0
treec2e05c855dd29ccbda28bdd46eeb74d165af94cd
parent60dcbc7ee53f7f258df40dc26ac75f5a5bc3ccff
parentb1b0ef4472e666f4646bf02d17cbf1a225020221
merge 0.19.x branch into master