Merge branch 'maint'

Conflicts:
	lib/libalpm/dload.c
	lib/libalpm/po/fi.po
	lib/libalpm/po/libalpm.pot
	po/de.po
	po/fi.po
	src/pacman/po/pacman.pot
	src/pacman/util.c

1 files changed, 1 insertions, 2 deletions

diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
index 393a2f2a..af3a3880 100644
--- a/doc/PKGBUILD.5.txt
+++ b/doc/PKGBUILD.5.txt
@@ -401,8 +401,7 @@ from (e.g., 'makepkg-git', 'mplayer-svn').
 		The SVN module to fetch.
 
 *Git*::
-	The generated pkgver will be one formatted by the 'git-describe'
-	command, with '-' characters converted to '_' characters.
+	The generated pkgver will be the date the package is built.
 
 	*_gitroot*;;
 		The URL (all protocols supported) to the GIT repository.