| commit | 7d703a839ab3deea780ad14b59f5d3162cea3eee | [log] [tgz] |
|---|---|---|
| author | Benedikt Böhm <bb@xnull.de> | 周二 1月 26 13:17:12 2010 +0100 |
| committer | Benedikt Böhm <bb@xnull.de> | 周二 1月 26 13:17:12 2010 +0100 |
| tree | ede5fe1286dc45bf7e7bc15f9ae5d129a39c1ab0 | |
| parent | d2240e40260c84ae3032552e907e0fe96debd214 [diff] | |
| parent | 4aaec2f734123538098a89bccf2a23f47baef3f5 [diff] |
Merge branch 'develop' of git://github.com/nvie/gitflow into develop Conflicts: gitflow