projects
/
people
/
teissler
/
ipfire-2.x.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e4d79ba
5ba9e66
)
Merge remote-tracking branch 'ms/xss' into next
author
Michael Tremer
<michael.tremer@ipfire.org>
Wed, 21 Aug 2013 15:40:44 +0000
(17:40 +0200)
committer
Michael Tremer
<michael.tremer@ipfire.org>
Wed, 21 Aug 2013 15:40:44 +0000
(17:40 +0200)
Trivial merge