Merge branch 'v1.2'
commita41d3bfb85328a3a44dc12be0e1767a121dcfe0d
authorHans Huebner <hans.huebner@gmail.com>
Sun, 29 Jan 2012 20:33:38 +0000 (29 21:33 +0100)
committerHans Huebner <hans.huebner@gmail.com>
Sun, 29 Jan 2012 20:33:38 +0000 (29 21:33 +0100)
tree5aba443cff9bcfbc3928266eedee8a6d701576fc
parent0a0ae0f57467f0c9748697abf6fec65d0773997a
parent06dbc10621e74a946361dcc55a9be4b6729fa19c
Merge branch 'v1.2'