Merge branch 'master' into 0.11
authorThomas Vander Stichele <thomas (at) apestaart (dot) org>
Wed, 25 Jan 2012 13:26:17 +0000 (14:26 +0100)
committerThomas Vander Stichele <thomas (at) apestaart (dot) org>
Wed, 25 Jan 2012 13:26:17 +0000 (14:26 +0100)
commit12043938ef3de7cff4762e76b718c21a3f1dbfc6
tree0ca10d9d195fe8c2117fd699bded4f448cdd146f
parent7fda5249ab56f0de09277df330780a3b90a2b306
parentd4f33651dc6ded8aba160182749a1ea1797775d2
Merge branch 'master' into 0.11
update-common