| commit | 2cea3f77444834fc924956be51a1f5fcc5b2637f | |
| author | David Maus <dmaus@ictsoc.de> | |
| Mon, 17 May 2010 14:32:31 +0000 (17 16:32 +0200) | ||
| committer | David Maus <dmaus@ictsoc.de> | |
| Mon, 17 May 2010 14:32:31 +0000 (17 16:32 +0200) | ||
| tree | dd792a4401a90ebaf8a692e3ad02a69e051445b9 | treesnapshot (tar.gz zip) |
| parent | d6064d2cdf5d8ed0a6568fe31d48d7cef258e214 | commitdiff |
| parent | 2daea07630ee48026504c56eedb9f050b66cfdd4 | commitdiff |
Merge branch 'master' into org-id-uuid
Conflicts:
lisp/ChangeLog
Conflicts:
lisp/ChangeLog
| lisp/ChangeLog | diff1 | diff2 | blobhistory |