From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 22 May 2013 10:54:30 +0000 (+0200)
Subject: Merge branch 'develop' into login_view_layout_improvements
X-Git-Tag: oc-android-1.4.3~24^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/14a60a13e7a23e64098aecbc7fbc927706faf336?hp=a4bd86cf14e9054040eeac5f7b65631d8489c007

Merge branch 'develop' into login_view_layout_improvements
---

diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt
index 1cfdddc8..d85eb899 100644
--- a/THIRD_PARTY.txt
+++ b/THIRD_PARTY.txt
@@ -44,7 +44,7 @@ The third party software included and used by this project is:
    Original license document included at libs/LICENSE.txt
    See http://jackrabbit.apache.org/
  
- * Transifex client.JavaMail API, version 1.4.3
+ * Transifex client.
    Copyright (C) Transifex.
    Licensed under GNU General Public License.
    Placed at third_party/transifex-client.