merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 6 Jul 2013 19:54:58 +0000 (21:54 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 6 Jul 2013 19:54:58 +0000 (21:54 +0200)
commit23cbe46e28cd74c4536735c3e594d602a2eccb29
tree10e4919cc95a58f4db61ef5e51daf318f1720a7e
parent5a0a853bc4ca58b47d55c6b38405abb33d436a88
parentb0a4fa4a1ccb6af4e89408754e6d65924e3a98e9
merge 0.19.x branch into master