Merge branch '0.6.4' into future
authorSofia Papagiannaki <papagian@gmail.com>
Fri, 2 Nov 2012 12:23:35 +0000 (14:23 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Fri, 2 Nov 2012 12:23:35 +0000 (14:23 +0200)
commit24976f0d5201e97e624b4008213ebaf761b520ad
treeaac23a53350537afab98e7e9beb65575cd26685f
parentbdd76c507d7c8b45a37443d7b187cc50ef928cf2
parenta2fca5babff2cd3ab048a2c678523572d1f0ad81
Merge branch '0.6.4' into future