merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 6 Jul 2013 17:00:46 +0000 (19:00 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 6 Jul 2013 17:00:46 +0000 (19:00 +0200)
commit5a0a853bc4ca58b47d55c6b38405abb33d436a88
tree825a786629000302e433923ec12f3ec70135bad8
parentdcbbf3bcf058e77103d9a6b6c77c201792d4653a
parentb612885e0e911c17a0e7374109b4c564433ffe5d
merge 0.19.x branch into master