diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-11-11 09:57:04 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-11-11 09:57:04 +0100 |
| commit | 001307c578431cedf5b4e495109145ca3c04da4b (patch) | |
| tree | d56e2b95c2d7ae5fab27c0845791c46719b58053 /cfengine/cf.generic | |
| parent | 50be5f7c0f3d5b245da0c9ab640b6e86e8a612ea (diff) | |
| parent | 87d53b78b69cd9ff5deeabf3dbd172374b8c3461 (diff) | |
Merge branch 'master' of git://source.jones.dk/local-COMMON
Conflicts (manually resolve):
mailman/mklist.inc
Diffstat (limited to 'cfengine/cf.generic')
0 files changed, 0 insertions, 0 deletions