merge 0.18.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 26 Jan 2013 09:57:20 +0000 (10:57 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 26 Jan 2013 09:57:20 +0000 (10:57 +0100)
commit5749974c1942735c349ac4fc9398298d1f66da5f
treeeb8ace5fa59696ff16701c0b65ba01de593e2c2a
parentd14012334218ae9cc4422b9972610df386b05bdf
parent3f41b340732c56ee62ad431c000d7ac55e1a1a32
merge 0.18.x branch into master