merged 0.17 branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sun, 4 Nov 2012 09:21:11 +0000 (10:21 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Sun, 4 Nov 2012 09:21:11 +0000 (10:21 +0100)
commit67c40b1da56bcff85c3bd6c6ab5d343e5d8b2f6f
tree323ac132bedce6eed5c27d21e83e59d50e709bb2
parentfa2cfc802ed302062520e7610102074fe405fc42
parent977c15c84d89834d7d1a911ef6946b8be9cecb0d
merged 0.17 branch into master