Merge branch 'development-0.4'
authorLuciano Montanaro <mikelima@cirulla.net>
Sun, 26 Jun 2011 15:51:11 +0000 (17:51 +0200)
committerLuciano Montanaro <mikelima@cirulla.net>
Sun, 26 Jun 2011 15:51:11 +0000 (17:51 +0200)
commitae48e0b3e6e3591b26bf61818f29c4d943504ced
tree42624138b2489690884e2de57f4fd965f8646889
parentb9a0d747c008be8c84d050fdd2e69bd7cf07f8a3
parenta4e387a7ffda7197ef45b3fc5ee08b872a310540
Merge branch 'development-0.4'