Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorsebix <szebi@gmx.at>
Wed, 25 Dec 2013 20:45:18 +0000 (21:45 +0100)
committersebix <szebi@gmx.at>
Wed, 25 Dec 2013 20:45:18 +0000 (21:45 +0100)
commit9987afecf5ca31d400a4a8119b19170d0bea560e
tree9ed9929149f74a8c48e97da454a167879aece6db
parent5a3ae028c621c4143287bfe6e463da00661e8e1f
parentb220a647e68ccc8bc04fa19e7b6d7d6a059a1670
Merge branch 'master' of https://git.bettercrypto.org/ach-master

Conflicts:
src/practical_settings/DBs.tex
src/practical_settings/vpn.tex
src/practical_settings/DBs.tex
src/practical_settings/vpn.tex