Merge branch 'master' into windows

Conflicts:
	Annex/Environment.hs
	Build/Configure.hs
	Git/Construct.hs
	Utility/FileMode.hs

debian/changelog

@@ -1,6 +1,8 @@
 git-annex (4.20130502) UNRELEASED; urgency=low
 
   * Android: The webapp is ported and working.
+  * Windows: There is a very rough Windows port. Do not trust it with
+    important data.
   * git-annex-shell: Ensure that received files can be read. Files
     transferred from some Android devices may have very broken permissions
     as received.
@@ -21,6 +23,7 @@ git-annex (4.20130502) UNRELEASED; urgency=low
   * rsync special remotes: When sending from a crippled filesystem, use
     the destination's default file permissions, as the local ones can
     be arbitrarily broken. (Ie, ----rwxr-x for files on Android)
+  * migrate: Detect if a file gets corrupted while it's being migrated.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 02 May 2013 20:39:19 -0400
 

debian/rules

@@ -4,7 +4,7 @@
 export CABAL=./Setup
 
 # Do use the changelog's version number, rather than making one up.
-export VERSION_FROM_CHANGELOG=1
+export RELEASE_BUILD=1
 
 %:
 	dh $@