merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 14 Sep 2013 09:31:16 +0000 (11:31 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 14 Sep 2013 09:31:16 +0000 (11:31 +0200)
commit73e5cb51a4fbbce559b47a59a9381195dd76d3e5
treedc3dd967e607af7208ec61556b4ef9d9336744ac
parentf7b8db1312ac3863f2f946908fda7f7fada332d0
parent3793b5a464472233a3b6e40372769b0483f53a05
merge 0.19.x branch into master