merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Fri, 5 Jul 2013 18:22:16 +0000 (20:22 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Fri, 5 Jul 2013 18:22:16 +0000 (20:22 +0200)
commit53ee50c77cc312a3a1a1016cd7d6ad2c506ed043
treeeb9286490f8b7e8010de4c6508e375c0035c1bfa
parent70d4e0bffd17897458c4cc6e78d0849c5cd59afe
parent7a2d215205d2c31c0233397f401bebbafd62bdc8
merge 0.19.x branch into master