diff options
| author | Micah <micah@riseup.net> | 2015-02-20 22:26:45 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-02-20 22:26:45 +0000 |
| commit | 877134184b26c0ff326d46ff332f287d9e8a1be1 (patch) | |
| tree | 81b6a17501350c3779b233a83bed4a525b69e4c4 /manifests/transport_regexp.pp | |
| parent | a9ec67ca025197e9e85b6d6752f76ff8cac37f92 (diff) | |
| parent | 3d3e096d8ddc6ff8a7d589e440fe621abb2b8767 (diff) | |
Merge branch 'master' into 'master'
Merge with cmaisonnneuve and immerda
This version should be compatible with the cleaned up common module.
See merge request !1
Diffstat (limited to 'manifests/transport_regexp.pp')
0 files changed, 0 insertions, 0 deletions