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

doc/bugs/immediately_drops_files/comment_5_7c9f660b6bcec31827a44a650e9d4622._comment

@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ"
+ nickname="Walter"
+ subject="comment 5"
+ date="2013-09-13T21:58:30Z"
+ content="""
+I had checked in the webapps, and they were all set to manual.
+
+Looking in `git annex vicfg`, the groups are set to manual, and the content is set to standard.
+"""]]

doc/devblog/day_9__Friday_the_13th/comment_1_07195b4ec399ba1be6c8bdb3ae0fa50b._comment

@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://nullroute.eu.org/~grawity/"
+ nickname="Mantas"
+ subject="comment 1"
+ date="2013-09-13T22:05:37Z"
+ content="""
+Windows *does* have something very much like symlinks – they're called *symlinks* (\"symbolic links\") and they are meant to [\"function just like UNIX links\"][1] as the official docs say.
+
+But on the other hand, yes – `isSymlink` makes less sense on Windows, because symlinks are just a type of reparse points, and there may be several other types (e.g. directory junctions should also be treated like symlinks, but mount points shouldn't...)
+
+[1]: http://msdn.microsoft.com/en-us/library/windows/desktop/aa365680(v=vs.85).aspx
+"""]]

doc/git-annex.mdwn

@@ -310,7 +310,7 @@ subdirectories).
   All special remotes support encryption. You can either specify
   `encryption=none` to disable encryption, or specify 
   `encryption=hybrid keyid=$keyid ...` to specify a gpg key id (or an email
-  address accociated with a key.
+  address associated with a key.)
 
   There are actually three schemes that can be used for management of the
   encryption keys. When using the encryption=hybrid scheme, additional