Commit graph

2 commits

Author SHA1 Message Date
Vincent Driessen
bd4a1f121f Merge branch 'review' into develop 2010-01-26 21:59:33 +01:00
Benedikt Böhm
7d703a839a Merge branch 'develop' of git://github.com/nvie/gitflow into develop
Conflicts:
	gitflow
2010-01-26 13:17:12 +01:00