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

Conflicts:
	stats/known_apks.txt

metadata/android.game.prboom.txt

@@ -27,5 +27,6 @@ Build Version:1.3.1-beta,31,49,buildjni=yes
 
 #Not in market
 Update Check Mode:None
+
 Current Version:1.3.1-beta
 Current Version Code:31

metadata/com.fsck.k9.txt

@@ -15,6 +15,7 @@ Repo:https://github.com/k9mail/k-9.git
 
 #Note - k9 is currently developer's binary only
 #Build Version:3.906,14006,3.906,oldsdkloc=yes,patch=target9to10.patch,target=android-10
+
 Update Check Mode:Market
 Current Version:4.011
 Current Version Code:14029

metadata/com.java.SmokeReducer.txt

@@ -0,0 +1,19 @@
+Category:Office
+License:Apache2
+Web Site:http://www.joshyyy.com/smoke_reducer.html
+Source Code:https://gitorious.org/smoke-reducer/smoke-reducer
+
+Summary:Track your smoking habits
+Description:
+First of all Smoke reducer (and stopper) records the distance between two times you are smoking. Then, it lengthens that time between each cigarette by telling you when to smoke. If you click the Sleep button, the time that you sleep isn't counted to the time between each alarm
+.
+
+Repo Type:git
+Repo:https://git.gitorious.org/smoke-reducer/smoke-reducer.git
+
+Build Version:1.0,1,3f999b
+
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+

metadata/com.showmehills.txt

@@ -28,3 +28,4 @@ echo "sdk.dir=$$SDK$$" >../ShowMeX/local.properties
 Update Check Mode:Market
 Current Version:0.20
 Current Version Code:20
+

metadata/me.guillaumin.android.osmtracker.txt

@@ -19,7 +19,7 @@ Repo:https://github.com/nguillaumin/osmtracker-android.git
 
 Build Version:0.5.6,21,0.5.6,target=android-8
 Build Version:0.5.7,22,eac27c8a37066988f784cbc2ad7e7a2ab0326839,target=android-8
-Build Version:0.5.8,23,623453d4f0,target=android-8
+Build Version:0.6.2,26,0.6.2,target=android-15
 
 Update Check Mode:Market
 Current Version:0.6.2

metadata/org.mozilla.firefox.txt

@@ -2,7 +2,7 @@ Category:Internet
 #mostly...
 License:MPL2
 #also links to ftp site 
-Website:https://wiki.mozilla.org/Mobile/Platforms/Android#System_Requirements
+Web Site:https://wiki.mozilla.org/Mobile/Platforms/Android#System_Requirements
 Source Code:http://hg.mozilla.org/
 Issue Tracker:https://bugzilla.mozilla.org/buglist.cgi?resolution=---&op_sys=Android
 

metadata/org.mozilla.firefox_beta.txt

@@ -2,7 +2,7 @@ Category:Internet
 #mostly...
 License:MPL2
 #this links to ftp site too
-Website:https://wiki.mozilla.org/Mobile/Platforms/Android#System_Requirements
+Web Site:https://wiki.mozilla.org/Mobile/Platforms/Android#System_Requirements
 Source Code:http://hg.mozilla.org/
 Issue Tracker:https://bugzilla.mozilla.org/buglist.cgi?resolution=---&op_sys=Android
 

metadata/paulscode.android.mupen64plusae.txt

@@ -12,7 +12,7 @@ N64 emulator now in beta. See website for link to compatibility wiki
 Repo Type:git
 Repo:https://github.com/paulscode/mupen64plus-ae.git
 
-#haven't tried to build it, need ssh to machine :-( .see readme for howto
+#libcore.so missing it looks like
 #Build Version=1.9.2,14,1408b6,buildjni=yes,subdir=main
 
 Update Check Mode:RepoManifest

metadata/se.johanhil.clipboard.txt

@@ -17,7 +17,7 @@ not implement the regular "send to" functionality, such as GTalk.
 Repo Type:git
 Repo:https://github.com/johanhil/copy-to-clipboard.git
 
-Build Version:1.0,2,c6c466770fb7215d957118216c2414ae69ca1bc8,target=4
+Build Version:1.0,2,c6c466770fb7215d957118216c2414ae69ca1bc8,target=android-15
 
 Update Check Mode:Market
 Current Version:1.0

stats/known_apks.txt

@@ -129,6 +129,7 @@ android.androidVNC_13.apk android.androidVNC 2011-04-06
 android.game.prboom_31.apk android.game.prboom 2012-03-10
 android.tether_26.apk android.tether 2012-07-26
 androidVNC_build20100725.apk android.androidVNC 2010-11-18
+apps.babycaretimer_6.apk apps.babycaretimer 2012-08-23
 apps.droidnotify_27.apk apps.droidnotify 2012-01-21
 apps.droidnotify_29.apk apps.droidnotify 2012-01-28
 apps.droidnotify_30.apk apps.droidnotify 2012-02-02
@@ -215,6 +216,7 @@ com.danga.squeezer_5.apk com.danga.squeezer 2011-03-02
 com.digitallizard.nicecompass_6.apk com.digitallizard.nicecompass 2012-01-28
 com.dozingcatsoftware.bouncy_10.apk com.dozingcatsoftware.bouncy 2011-08-04
 com.dozingcatsoftware.bouncy_4.apk com.dozingcatsoftware.bouncy 2011-03-10
+com.dozingcatsoftware.dodge_8.apk com.dozingcatsoftware.dodge 2012-08-23
 com.dririan.RingyDingyDingy_5.apk com.dririan.RingyDingyDingy 2012-08-10
 com.dririan.RingyDingyDingy_600.apk com.dririan.RingyDingyDingy 2012-08-10
 com.dririan.RingyDingyDingy_700.apk com.dririan.RingyDingyDingy 2012-08-10