From: Ivo Ugrina <ivo@iugrina.com>
Date: Fri, 7 Oct 2011 12:25:59 +0000 (+0200)
Subject: merge with upstream
X-Git-Tag: 0.1~1263^2~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=327e8932e73d62fe96584cd79776ff734d1d10ce;p=fdroidserver.git

merge with upstream
---

327e8932e73d62fe96584cd79776ff734d1d10ce
diff --cc metadata/info.staticfree.android.units.txt
index a75fcdc9,8a70c5f6..b826203e
--- a/metadata/info.staticfree.android.units.txt
+++ b/metadata/info.staticfree.android.units.txt
@@@ -12,9 -12,7 +12,12 @@@ Repo Type:gi
  Repo:git://staticfree.info/git/Units/
  Build Version:0.8,7,8be8c10c67152783b6871a70d077a0758e5086ba
  Build Version:0.9,8,3cde1f8d6b822ddcee23f984fab53e7bad3817df
 +Build Version:1.0,9,1db6cd055203bd2f15eaffd7a780db2ee22974af,target=android-10
  
  
++<<<<<<< HEAD
 +
++=======
++>>>>>>> upstream/master
  Market Version:1.0
  Market Version Code:9