Merge remote-tracking branch 'remotes/upstream/master'
authorRené Schwarz <mail@rene-schwarz.com>
Sun, 19 Oct 2014 21:06:55 +0000 (23:06 +0200)
committerRené Schwarz <mail@rene-schwarz.com>
Sun, 19 Oct 2014 21:06:55 +0000 (23:06 +0200)
1  2 
src/acknowledgements.tex

Simple merge