merge 0.18.x branch back into master
authorStefan Behnel <stefan_ml@behnel.de>
Mon, 21 Jan 2013 07:42:57 +0000 (08:42 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Mon, 21 Jan 2013 07:42:57 +0000 (08:42 +0100)
commit0d9c866009d971a27861e619a3411b6609f8ddaf
tree75d246d04f87f0294682c523de937924142c9d96
parent091bdf3cfd0ba1b3ae1c2b834b1c290b20a68516
parent3dbffcfd51e26092afa7bd5ef3014912152b6b82
merge 0.18.x branch back into master