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)
commit2c520035639976d59407b59587c874365b8828b3
treef20a55c53c8b4f2fd64f7c7ec42c87ac56c971a1
parent2e843b655e1dab7d5f8c9bcc3f6c416348951fa8
parent933ca06990fecf6f4b5385cda891f8970fbfd43b
Merge remote-tracking branch 'remotes/upstream/master'
src/acknowledgements.tex