chiark / gitweb /
Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver
authorHans-Emil Skogh <hansemil@gmail.com>
Sat, 21 Jan 2012 10:17:43 +0000 (11:17 +0100)
committerHans-Emil Skogh <hansemil@gmail.com>
Sat, 21 Jan 2012 10:17:43 +0000 (11:17 +0100)
commit08c272b93d29bfcc7160fb689fd54d47895f6ee4
tree9986232b3f2fc28993f6cf4aae55db4251f94851
parente915f71a81d996c4802835553f4667949497ae7c
parentd6b08552185a51efe38e7e30291bcfa3b5e99521
Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver

Conflicts:
wp-fdroid/wp-fdroid.php
wp-fdroid/wp-fdroid.php