projects
/
people
/
teissler
/
ipfire-2.x.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8490e49
39e96de
)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
author
Michael Tremer
<michael.tremer@ipfire.org>
Fri, 18 Apr 2014 20:24:24 +0000
(22:24 +0200)
committer
Michael Tremer
<michael.tremer@ipfire.org>
Fri, 18 Apr 2014 20:24:24 +0000
(22:24 +0200)
Trivial merge