repositories / ker2014-2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a10ed62 8e0bbc7)
Merge branch 'master' of https://github.com/dopefishh/ker2014-2
authorMargo van der Stam <margo.stam@gmail.com>
Tue, 6 Jan 2015 09:39:50 +0000 (10:39 +0100)
committerMargo van der Stam <margo.stam@gmail.com>
Tue, 6 Jan 2015 09:39:50 +0000 (10:39 +0100)

Trivial merge
1415-S1 - SOW-BKI312: Knowledge representation and reasoning