Merge remote-tracking branch 'origin/2.1'
authorOlivier Goffart <ogoffart@woboq.com>
Mon, 8 Feb 2016 13:28:25 +0000 (14:28 +0100)
committerOlivier Goffart <ogoffart@woboq.com>
Mon, 8 Feb 2016 13:28:25 +0000 (14:28 +0100)
commit93308faeb9a8fc4a1198673b0ce48b64d2d934ac
treec7945fa0e368152e1c5f4fb4f8ab1a42f82a910c
parent16ab3ca6a60e9e140be0b2f9a6dc5c131dd76d82
parentf140d3447c43e64626fb70194b65e727925b5181
Merge remote-tracking branch 'origin/2.1'

 Conflicts:
doc/building.rst
csync/src/csync_update.c
doc/building.rst