tree f69c7e3df0473cdcba54f496c3c2d224e52a77a4
parent 04839aeffa54ec3b408c4e22ad39ef2abb4a8ab3
parent b866b01ba43c484e89ab36ec5fa127d053940249
author Vincent Driessen <vincent@datafox.nl> 1264637996 +0100
committer Vincent Driessen <vincent@datafox.nl> 1264637996 +0100

Merge branch 'feature/subcmd-structure' into develop

Conflicts:
	git-flow-feature
	git-flow-hotfix
	git-flow-release
	git-flow-support