Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Thu, 17 May 2012 11:36:25 +0000 (13:36 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Thu, 17 May 2012 11:36:25 +0000 (13:36 +0200)
commit23dfbc41d86f6b60ae8aeca9593587db1e18e5a3
tree1ccff145a4cec7aa9c75c1e41375eb73dd160b2d
parentae0f8fe4a09c5a4a3bb8fef267c6146d6df9d1e0
parent1478a43b4e9d57bdb0657bccf02bb6e128395c3b
Merge branch 'master' into release