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

Conflicts:
	fdroidserver/common.py

diff --cc fdroidserver/common.py
index 01c68922d19168b00248ded298fc5a417e760723,5186c170750d6b666ba2e62d7399096eae93841f..9a1b1a78060cfa0f4a24e6859dbfdca679fb44f6
--- 1/fdroidserver/common.py
--- 2/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)