The code which tried to update the master branch was somewhat broken.
=> People should do that manually, with "git merge".
Signed-off-by: NMatthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>