Merge branch 'develop'
authorMart Lubbers <mart@martlubbers.net>
Thu, 24 Jul 2014 10:05:08 +0000 (12:05 +0200)
committerMart Lubbers <mart@martlubbers.net>
Thu, 24 Jul 2014 10:05:08 +0000 (12:05 +0200)
Conflicts:
thesis/methods.tex


Trivial merge