diff options
| author | admin (centauri.fritz.box) <puppet@mx.buetow.org> | 2014-03-22 12:24:43 +0100 |
|---|---|---|
| committer | admin (centauri.fritz.box) <puppet@mx.buetow.org> | 2014-03-22 12:24:43 +0100 |
| commit | 9c79b8da43e327cb954b39249efde5c9f1ef87c0 (patch) | |
| tree | c84ef6ca6a0757e4e0134a85ab726c49c9f5e0cb | |
| parent | b4558f620a4e30731b01b6e0f60da869e3de5e1b (diff) | |
| parent | d6f78c532c2c23b1203b1c0332de89a8c8c53d04 (diff) | |
Merge branch 'master' into devel
| -rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -PerlDaemon v1.3-devel +PerlDaemon v1.2.1-master |