Merge branch 'v1.2'
commit091e1ef2fccc2e69b6002e32b7ddadff6deb7384
authorHans Huebner <hans.huebner@gmail.com>
Wed, 30 Nov 2011 19:43:44 +0000 (30 20:43 +0100)
committerHans Huebner <hans.huebner@gmail.com>
Wed, 30 Nov 2011 19:43:44 +0000 (30 20:43 +0100)
tree3015125413c9b55415e82bd55c3f04995840a28f
parent1391f210b0eed92a3c854927afba255652ae6bfe
parentb302f2c0230529c4d6f072a6662fe78afe5cf63f
Merge branch 'v1.2'