chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9386bbf
db18a89
)
Merge remote-tracking branch 'upstream/master'
author
Tovok7
<Tovok7@gmx.de>
Mon, 9 Jan 2012 23:33:06 +0000
(
00:33
+0100)
committer
Tovok7
<Tovok7@gmx.de>
Mon, 9 Jan 2012 23:33:06 +0000
(
00:33
+0100)
Trivial merge