Merge remote-tracking branch 'upstream/master'
authorberq <bs@cyontris.eu>
Thu, 26 Dec 2013 10:38:19 +0000 (11:38 +0100)
committerberq <bs@cyontris.eu>
Thu, 26 Dec 2013 10:38:19 +0000 (11:38 +0100)
commita30c309a3f6063d0d1c7191e6b6db8a226dd1969
treee2c71478755cd955d1d9d2fdf7161be76e3e8f72
parent464ddbca6d137bc4dcc38afa3028940ed839be08
parent5e72361aed4a99bf859d495facd74b2a77733cdf
Merge remote-tracking branch 'upstream/master'

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