tree f87c2c86cfb2e99f6fe6e5972f0cbd7acd0272a8
parent e1ec57d48ac5c234262d84469af56b00b38929ab
parent 1c289cf3089baa14738da0e198f2a3a80fb7b4bf
author Vincent Driessen <vincent@datafox.nl> 1287433023 +0200
committer Vincent Driessen <vincent@datafox.nl> 1287433023 +0200

Merge branch 'release/0.4' into develop