Merge branch 'master' into desymlink

Git/Construct.hs

@@ -125,7 +125,7 @@ remoteNamed n constructor = do
 	return $ r { remoteName = Just n }
 
 {- Sets the name of a remote based on the git config key, such as
-   "remote.foo.url". -}
+ - "remote.foo.url". -}
 remoteNamedFromKey :: String -> IO Repo -> IO Repo
 remoteNamedFromKey k = remoteNamed basename
   where

Git/Sha.hs

@@ -11,7 +11,7 @@ import Common
 import Git.Types
 
 {- Runs an action that causes a git subcommand to emit a Sha, and strips
-   any trailing newline, returning the sha. -}
+ - any trailing newline, returning the sha. -}
 getSha :: String -> IO String -> IO Sha
 getSha subcommand a = maybe bad return =<< extractSha <$> a
   where