| commit | f80ca2065f38bc6e356f30a47a630d2332c8f14f | |
| author | Arian <arian@aryweb.nl> | |
| Tue, 29 Nov 2011 21:44:00 +0000 (29 22:44 +0100) | ||
| committer | Arian <arian@aryweb.nl> | |
| Tue, 29 Nov 2011 21:48:27 +0000 (29 22:48 +0100) | ||
| tree | cc61a55c6452c6c523fbe25026bbec30b9576887 | treesnapshot (tar.gz zip) |
| parent | fa2a8c80a5c26973b882e63c89d8c591ec1330dc | commitdiff |
| parent | 4ebf266467c05b4c9cceccba12de2493f1ff36df | commitdiff |
Fixes #2134 - Merge branch 'specs' into fix-2134-merge-specs-submodule
Conflicts:
.gitignore
.gitmodules
Conflicts:
.gitignore
.gitmodules
| .gitignore | diff1 | diff2 | blobhistory |
| .gitmodules | diff1 | diff2 | blobhistory |