Merge commit 'refs/merge-requests/32' of git://gitorious.org/f-droid/fdroidserver...

diff --cc metadata/com.fsck.k9.txt
index e143a0a11a0b0b5e26253fcf2de32554144e4dcd,3f831f9df1a5ef1de5971af90f99c72e1f20f0e2..31b29d48161956b673da349b860e65262b52ddb0
--- 1/metadata/com.fsck.k9.txt
--- 2/metadata/com.fsck.k9.txt
+++ b/metadata/com.fsck.k9.txt
@@@ -1,6 -1,7 +1,7 @@@
  License:Apache2
+ Category:Internet
  Web Site:http://code.google.com/p/k9mail/
 -Source Code:http://code.google.com/p/k9mail/source/checkout
 +Source Code:https://github.com/k9mail/k-9
  Issue Tracker:http://code.google.com/p/k9mail/issues/list
  Summary:Full-featured email client
  Description:

diff --cc metadata/com.google.android.maps.mytracks.txt
Simple merge

diff --cc metadata/de.shandschuh.sparserss.txt
Simple merge

diff --cc metadata/me.guillaumin.android.osmtracker.txt
index 85e31b910d3b1828aa923cc9c6d9ba32a83c19a1,a144998d9021f335aa65ac703a503193cafc9f2a..67ef0f427266288bd8c40937a3e9fa5e145532e2
--- 1/metadata/me.guillaumin.android.osmtracker.txt
--- 2/metadata/me.guillaumin.android.osmtracker.txt
+++ b/metadata/me.guillaumin.android.osmtracker.txt
@@@ -1,7 -1,8 +1,8 @@@
  Use Built:Yes
  License:GPLv3
+ Category:Navigation
  Web Site:https://code.google.com/p/osmtracker-android/
 -Source Code:https://code.google.com/p/osmtracker-android/source/checkout
 +Source Code:https://github.com/nguillaumin/osmtracker-android
  Issue Tracker:https://code.google.com/p/osmtracker-android/issues/list
  Donate:
  Summary:GPS Track Recorder

diff --cc metadata/org.pocketworkstation.pckeyboard.txt
Simple merge