git://git.camperquake.de
/
xmlrtorrent.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
07bc5fb
3b9c53f
)
Merge branch 'master' into plugin
author
Christian Garbs
<mitch@cgarbs.de>
Fri, 26 Dec 2008 23:00:07 +0000
(
00:00
+0100)
committer
Christian Garbs
<mitch@cgarbs.de>
Fri, 26 Dec 2008 23:00:07 +0000
(
00:00
+0100)
Conflicts:
bugs/issue-
fa406e503dacdd866dfa5b4e8d2a60b4bdebaaeb
.yaml
Trivial merge