Merge branch 'master' into tests-init
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 6 Nov 2010 20:48:49 +0000 (21:48 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 6 Nov 2010 20:48:49 +0000 (21:48 +0100)
commitb191caac0e3ddb749d552565e4804d93a36b470e
tree82deda4ca4dc82b5ffc74450e308c094b89a72e8
parentadba8e96113e4883ec568babd14709538fc696c6
parent4555c818e5ae6a90a8116e9c5b5b1ff6a65929c0
Merge branch 'master' into tests-init