Merge branch 'master' of https://rhodecode.plunge.at/ach/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Mon, 4 Nov 2013 22:22:41 +0000 (23:22 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Mon, 4 Nov 2013 22:22:41 +0000 (23:22 +0100)
1  2 
src/practical_settings.tex

Simple merge