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)
commit4d14da45f53f7860f23d59bc138978ea020c0d74
treed706a4f364a4493b5963f8261b7186c96032b8fd
parent069c32912503385751c8aa46892d41311354e04c
parentc2e07a7c64b014f099f56a2cfccef171b261c41f
Merge branch 'develop'

Conflicts:
thesis/methods.tex