merge 0.17 branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Wed, 28 Nov 2012 20:27:18 +0000 (21:27 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Wed, 28 Nov 2012 20:27:18 +0000 (21:27 +0100)
commit25b44c9993218f0be3d05698500b1445f973e5dc
treef6f926e282ab59c9faf594271803134bbbea4df4
parenta30d7e5a45e34907032109c2c81407b6132b12af
parent37724cccf7258445d4d5b710519fbf4bcc2df7dc
merge 0.17 branch into master