merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 23 Nov 2013 07:50:43 +0000 (08:50 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 23 Nov 2013 07:50:43 +0000 (08:50 +0100)
commita11d92ebcda59043f7cd57386b5e03eba9ef4052
tree47f49470546c15775c61fdd30710ce7171c7714f
parent8f6412275c4c2d1dcf43ad40306f858b114104ed
parenta6195f1a44ab21f5aa4b2a1b1842dd93115a3f42
merge 0.19.x branch into master