projects
/
people
/
teissler
/
ipfire-2.x.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a538898
63efc01
)
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
author
Arne Fitzenreiter
<arne_f@ipfire.org>
Sun, 29 Dec 2013 19:32:47 +0000
(20:32 +0100)
committer
Arne Fitzenreiter
<arne_f@ipfire.org>
Sun, 29 Dec 2013 19:32:47 +0000
(20:32 +0100)
Trivial merge