merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 12 Oct 2013 08:19:18 +0000 (10:19 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 12 Oct 2013 08:19:18 +0000 (10:19 +0200)
commit7accb3e4f4f9cccf35edfe1a99f8857d4e0a49d0
tree4afcff38d7b027d6d8b897db30ac0db5dc3e41f8
parent46d075e9d1b92f69e227e2e9e7cd0abc617087af
parent26adc6f028b5e92bd8767f1367c97e46470b9762
merge 0.19.x branch into master