Merge branch 'master' into assistant

Conflicts:
	GitAnnex.hs

GitAnnex.hs

@@ -5,6 +5,8 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
+{-# LANGUAGE CPP #-}
+
 module GitAnnex where
 
 import System.Console.GetOpt
@@ -58,8 +60,10 @@ import qualified Command.Import
 import qualified Command.Map
 import qualified Command.Upgrade
 import qualified Command.Version
+#ifdef WITH_ASSISTANT
 import qualified Command.Watch
 import qualified Command.Assistant
+#endif
 
 cmds :: [Command]
 cmds = concat
@@ -101,8 +105,10 @@ cmds = concat
 	, Command.Map.def
 	, Command.Upgrade.def
 	, Command.Version.def
+#ifdef WITH_ASSISTANT
 	, Command.Watch.def
 	, Command.Assistant.def
+#endif
 	]
 
 options :: [Option]