Merge branch 'maint'

diff --cc po/sv.po
index 52282395c9b2689cbc0fa371f61de6010010c2b1,141b8d51820116d3770718f0e17cb531a3f5695e..7ce7e581d9afdb111503767362fc1458c0adb8cc
--- 1/po/sv.po
--- 2/po/sv.po
+++ b/po/sv.po
@@@ -7,8 -7,8 +7,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: git 1.7.12\n"
  "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 -"POT-Creation-Date: 2012-08-06 23:47+0800\n"
 +"POT-Creation-Date: 2012-09-15 10:21+0800\n"
- "PO-Revision-Date: 2012-09-21 08:06+0100\n"
+ "PO-Revision-Date: 2012-10-02 08:15+0100\n"
  "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
  "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
  "Language: sv\n"