Merge remote-tracking branch 'upstream/master' into android_async
authorArmin Novak <anovak@thinstuff.com>
Fri, 4 Oct 2013 07:48:01 +0000 (09:48 +0200)
committerArmin Novak <anovak@thinstuff.com>
Fri, 4 Oct 2013 07:48:01 +0000 (09:48 +0200)
commitb5e7a91690aa23f549acbb5849dee18b6a52beda
tree4fbf21f0385bce31363a20044766993bc87e8240
parent836ccc28b231f9b196182b5d4a669ca7c5d7418c
parent3db1b51ba1d2e31fa090f6e8cbc836a600fe9a80
Merge remote-tracking branch 'upstream/master' into android_async