Merge remote-tracking branch 'origin/next' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 3 Oct 2013 12:26:33 +0000 (14:26 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 3 Oct 2013 12:26:33 +0000 (14:26 +0200)
commit0203401cf5dcd2fc005eb33a593b625f56258463
tree07c5f93da4cfdeb49b48289d29c6681f28049729
parent78403883e23271c9a7ab2bdfeeaf64cc20fd11b4
parent2d685e1d4c4959ef6a85c285e9f952b713527d50
Merge remote-tracking branch 'origin/next' into fifteen

Conflicts:
doc/language_issues.es
doc/language_issues.fr
doc/language_issues.nl
doc/language_issues.pl
doc/language_issues.tr
doc/language_missings
14 files changed:
config/rootfiles/oldcore/73/filelists/files
config/rootfiles/oldcore/73/update.sh
doc/language_issues.de
doc/language_issues.en
doc/language_issues.es
doc/language_issues.fr
doc/language_issues.nl
doc/language_issues.pl
doc/language_issues.ru
doc/language_issues.tr
doc/language_missings
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
src/initscripts/init.d/tor