Merge branch '2.3'
authorChristian Kamm <mail@ckamm.de>
Thu, 8 Jun 2017 11:02:34 +0000 (13:02 +0200)
committerChristian Kamm <mail@ckamm.de>
Thu, 8 Jun 2017 11:02:34 +0000 (13:02 +0200)
1  2 
src/libsync/propagatedownload.cpp

Simple merge