chiark / gitweb /
~ianmdlvl / fdroidserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a482b37 d95aba9)
Merge remote-tracking branch 'upstream/master'
authorTovok7 <Tovok7@gmx.de>
Mon, 16 Jan 2012 01:17:07 +0000 (02:17 +0100)
committerTovok7 <Tovok7@gmx.de>
Mon, 16 Jan 2012 01:17:07 +0000 (02:17 +0100)
Conflicts:
metadata/org.jmoyer.NotificationPlus.txt


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.