From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 18 May 2013 08:22:09 +0000 (+0200)
Subject: Merge branch 'aapt_fixes'
X-Git-Tag: 0.1~594
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f89d4185704813153210875a80b1500e57577f9c;p=fdroidserver.git

Merge branch 'aapt_fixes'
---

f89d4185704813153210875a80b1500e57577f9c