tree 820db86e143bf1991e63334103294604da126fa4
parent 3d41ea0e91c7d86ace0e135a551bd5852bdd7b3d
parent 7c4cc65963056d81fb05a213409a2d40d3c369a7
author Vincent Driessen <vincent@datafox.nl> 1279808337 +0200
committer Vincent Driessen <vincent@datafox.nl> 1279808337 +0200

Merge branch 'release/0.3' into develop

Conflicts:
	git-flow-version