merge 0.18.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 26 Jan 2013 18:20:35 +0000 (19:20 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 26 Jan 2013 18:20:35 +0000 (19:20 +0100)
commit1dc2a10133fdef106520b708d0f7912cf639ef89
tree47b07b98efc6661d5c8edde17d33dc97cd48ca4a
parentb3c8e6c94cdbd1402b8e03b6e4adca0be8930fc3
parenta498d5231adb20b8677aee18ea2cd643b1c41bcd
merge 0.18.x branch into master