chiark / gitweb /
~ianmdlvl / fdroidserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4faf56 65031e9)
Merge remote-tracking branch 'upstream/master'
authorTovok7 <Tovok7@gmx.de>
Thu, 19 Jan 2012 23:44:37 +0000 (00:44 +0100)
committerTovok7 <Tovok7@gmx.de>
Thu, 19 Jan 2012 23:44:37 +0000 (00:44 +0100)

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