| commit | 3dce9e639744f9ddad492638c42b88b01e4a4ce4 | [log] [tgz] |
|---|---|---|
| author | Justin Hileman <justin@justinhileman.info> | Wed Oct 20 21:42:22 2010 -0400 |
| committer | Justin Hileman <justin@justinhileman.info> | Wed Oct 20 21:42:22 2010 -0400 |
| tree | 96b2029ab74bb440b7a0d60c5d2948cc8468d7d9 | |
| parent | e3f5953113c481c9f8d28ec3036bc6dbeb1b67c0 [diff] | |
| parent | b4e11fcae199b3e1980faecfc62d1871c749b66d [diff] |
Merge branch 'feature/git-flow-0-4-support' into develop