Merge branch 'master' of ssh://git-annex.branchable.com

Conflicts: doc/install/cabal.mdwn
2013-09-12 17:45:54 -04:00 · 2013-09-12 17:45:54 -04:00 · 60149d8ce3
commit 60149d8ce3
parent 422cc2e892 1ddacb768b
12 changed files with 333 additions and 9 deletions
--- a/doc/install/cabal/comment_19_74639fe525042aca12f9557d5d6a4f98._comment
+++ b/doc/install/cabal/comment_19_74639fe525042aca12f9557d5d6a4f98._comment
@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://id.koumbit.net/anarcat"
- ip="2001:1928:1:9::1"
- subject="manpages?"
- date="2013-09-10T05:00:49Z"
- content="""
-the manual install process doesn't seem to install manpages - how do we do that?
-"""]]