projects
/
puppet_common.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
485929e
76b0a31
)
Merge git://labs.riseup.net/module_common
author
Silvio Rhatto
<rhatto@riseup.net>
Sun, 6 Dec 2009 19:18:24 +0000
(17:18 -0200)
committer
Silvio Rhatto
<rhatto@riseup.net>
Sun, 6 Dec 2009 19:18:24 +0000
(17:18 -0200)
1
2
manifests/defines/line.pp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
manifests/defines/line.pp
Simple merge