From: David Black <david8black@gmail.com>
Date: Mon, 11 Feb 2013 16:05:24 +0000 (+0000)
Subject: Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver
X-Git-Tag: 0.1~673^2~10
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=25c6c4abd406648269f9dff3b5a05ef3658c08aa;p=fdroidserver.git

Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver

Conflicts:
	fdroidserver/common.py
---

25c6c4abd406648269f9dff3b5a05ef3658c08aa
diff --cc fdroidserver/common.py
index 01c68922,5186c170..9a1b1a78
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@@ -1511,13 -1511,13 +1511,20 @@@ def getsrclib(spec, extlib_dir, sdk_pat
              raise BuildException('Error updating AndrozicLib project')
          return sdir
  
+     if name == 'Otr4j':
+ 	sdir = os.path.join(extlib_dir, 'Otr4j')
+         vcs = getvcs('git',
+ 	    'https://github.com/redsolution/otr4j.git', sdir, sdk_path)
+         vcs.gotorevision(ref)
+         return sdir
+ 
 +    if name == 'AnySoftKeyboardTools':
 +        sdir = os.path.join(extlib_dir, 'AnySoftKeyboardTools')
 +        vcs = getvcs('git',
 +	    'https://github.com/AnySoftKeyboard/AnySoftKeyboardTools', sdir, sdk_path)
 +        vcs.gotorevision(ref)
 +        return sdir
 +
      raise BuildException('Unknown srclib ' + name)