projects
/
people
/
teissler
/
ipfire-2.x.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3bb77d0
285de10
)
Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire...
author
Alexander Marx
<amarx@ipfire.org>
Tue, 1 Oct 2013 18:30:06 +0000
(20:30 +0200)
committer
Alexander Marx
<amarx@ipfire.org>
Tue, 1 Oct 2013 18:30:06 +0000
(20:30 +0200)
Trivial merge