From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Mon, 3 Oct 2011 07:57:22 +0000 (+0100)
Subject: Merge commit 'refs/merge-requests/32' of git://gitorious.org/f-droid/fdroidserver... 
X-Git-Tag: 0.1~1272
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0a77c561c5ed2d524f0bac034880a7cc8e48fd81;p=fdroidserver.git

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

0a77c561c5ed2d524f0bac034880a7cc8e48fd81
diff --cc metadata/com.fsck.k9.txt
index e143a0a1,3f831f9d..31b29d48
--- a/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/me.guillaumin.android.osmtracker.txt
index 85e31b91,a144998d..67ef0f42
--- a/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