| commit | a7ff31832d37aa62d3ec8710b5ee44eba59a273e | [log] [tgz] |
|---|---|---|
| author | Vincent Driessen <vincent@datafox.nl> | 周四 7月 22 16:18:57 2010 +0200 |
| committer | Vincent Driessen <vincent@datafox.nl> | 周四 7月 22 16:18:57 2010 +0200 |
| tree | 820db86e143bf1991e63334103294604da126fa4 | |
| parent | 3d41ea0e91c7d86ace0e135a551bd5852bdd7b3d [diff] | |
| parent | 7c4cc65963056d81fb05a213409a2d40d3c369a7 [diff] |
Merge branch 'release/0.3' into develop Conflicts: git-flow-version