projects
/
snf-image
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
da5f4b8
aea26aa
)
Merge branch 'master' into debian-0.8
author
Nikos Skalkotos
<skalkoto@grnet.gr>
Mon, 11 Mar 2013 15:04:41 +0000
(17:04 +0200)
committer
Nikos Skalkotos
<skalkoto@grnet.gr>
Mon, 11 Mar 2013 15:04:41 +0000
(17:04 +0200)
Conflicts:
snf-image-host/version_pinning.pref
Trivial merge