Martin 8d71071ea0 Merge remote-tracking branch 'gh/dev' into dev ... # Conflicts: # urbackupclient/client.cpp		2017-03-03 17:33:47 +01:00
..
de
en	Merge remote-tracking branch 'gh/dev' into dev	2017-03-03 17:33:47 +01:00
progress-start.sh