Merge branch 'development-0.4' tags/0.3.6
authorLuciano Montanaro <mikelima@cirulla.net>
Sun, 26 Jun 2011 10:28:01 +0000 (12:28 +0200)
committerLuciano Montanaro <mikelima@cirulla.net>
Sun, 26 Jun 2011 10:28:01 +0000 (12:28 +0200)
commitb9a0d747c008be8c84d050fdd2e69bd7cf07f8a3
tree75611db9693dcd9c12f4f42ee83a4b530a489046
parentae6972763c1e54485a0832134bb6c02b0cd88a8d
parentddf36aa596dbcfcdfff19674c99212edc2d9ecfb
Merge branch 'development-0.4'