Merge branch 'master' fdroiddata
authorDavid Black <david8black@gmail.com>
Tue, 30 Apr 2013 18:49:43 +0000 (19:49 +0100)
committerDavid Black <david8black@gmail.com>
Tue, 30 Apr 2013 18:49:43 +0000 (19:49 +0100)
commit0b2ee1b230630ecf8c9d6ce1cbaafb72c118795c
treea2f6f312cf7dda6eecf2ee649426daa6ef3b0d9b
parenta5deaf650b3dbe58bf7154e8689656e369ac799f
parentd0d483c451a43097bbcaa46430d09b4922dfb6dd
Merge branch 'master' fdroiddata

Conflicts:
metadata/com.jpkrause.c_feed.txt