| commit | 019331d25b6af107fb8cacc3ada552e7567a64bf | |
| author | Tanu Kaskinen <tanuk@iki.fi> | |
| Fri, 2 Oct 2009 14:24:44 +0000 (2 17:24 +0300) | ||
| committer | Tanu Kaskinen <tanuk@iki.fi> | |
| Fri, 2 Oct 2009 14:24:44 +0000 (2 17:24 +0300) | ||
| tree | d5545e795e164fb6cd8edae1a45e7b8bb966ee12 | treesnapshot (tar.gz zip) |
| parent | 587131917f9129c8347c789febb7e755dfb091de | commitdiff |
| parent | afd1b6d355ef1a41cb3592485855e273a5de69c1 | commitdiff |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
Conflicts:
src/daemon/daemon-conf.c