merge 0.18.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sun, 27 Jan 2013 04:56:27 +0000 (05:56 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Sun, 27 Jan 2013 04:56:27 +0000 (05:56 +0100)
commit4075ee7252bcd7f16425780baa043910ce4fcc74
treee237684fe5c602f336a248f25fcfe4916925e2fe
parentb03f0a200b6b1ad603e332b170aa076e37f84df1
parenta49992f1359fb75c9fac5b816c0caf06cdeb4a49
merge 0.18.x branch into master