Merge remote-tracking branch 'origin/2.1'

 Conflicts:
	doc/building.rst

diff --cc csync/src/csync_update.c
Simple merge

diff --cc doc/building.rst
index 112f92a31bc7a6adfe4d98fff22c432367865aa5,0cfd0ec9d4b582d179557691869ccfea6d8877d1..465efc0189775aadf8e287965bd59d1da47a59e2
--- 1/doc/building.rst
--- 2/doc/building.rst
+++ b/doc/building.rst
@@@ -195,10 -193,9 +193,10 @@@ To build the most up to date version o
  
  1. Clone the latest versions of the client from Git_ as follows::
  
-     git clone git://github.com/owncloud/client.git
-     cd client
-     git submodule init
-     git submodule update
+      git clone git://github.com/owncloud/client.git
++     cd client
+      git submodule init
+      git submodule update
  
  2. Create the build directory::
  
@@@ -207,14 -204,14 +205,14 @@@
  
  3. Configure the client build::
  
 -     cmake -DCMAKE_BUILD_TYPE="Debug" ../client
 +    cmake -DCMAKE_BUILD_TYPE="Debug" ..
  
-   .. note:: You must use absolute paths for the ``include`` and ``library``
-            directories.
+    .. note:: You must use absolute paths for the ``include`` and ``library``
+             directories.
  
-   .. note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``,
-            where ``target`` is a private location, i.e. in parallel to your build
-            dir by specifying ``../install``.
+    .. note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``,
+             where ``target`` is a private location, i.e. in parallel to your build
+             dir by specifying ``../install``.
  
  4. Call ``make``.