| commit | 50b28edc865a506c6cce9bf2055867a0abce242f | |
| author | Arnout Engelen <arnouten@bzzt.net> | |
| Sun, 10 Aug 2014 15:17:22 +0000 (10 17:17 +0200) | ||
| committer | Arnout Engelen <arnouten@bzzt.net> | |
| Sun, 10 Aug 2014 15:17:22 +0000 (10 17:17 +0200) | ||
| tree | d9f2a8bbb1e1732fda839029cf61d96fbc3952b4 | treesnapshot (tar.gz zip) |
| parent | 6da8570d4c9a70362d2a9b4769dad63dd6d20da3 | commitdiff |
| parent | 6ca5050940a61e99027ff5d174750ce19c70b344 | commitdiff |
Merge branch 'master' into travis
Conflicts:
.gitmodules
Conflicts:
.gitmodules