merge 0.18.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sun, 27 Jan 2013 05:16:47 +0000 (06:16 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Sun, 27 Jan 2013 05:16:47 +0000 (06:16 +0100)
commit3e9bfbb6594c839880949c07a7d901dc48bc9c41
treeda01cdb335cf07720c0964d6aa9a25e603b9cb93
parent4075ee7252bcd7f16425780baa043910ce4fcc74
parent372afe70291cb1e2aaf2bb40f9ce34c409a34094
merge 0.18.x branch into master