]> err.no Git - dak/commit
projects / dak / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3b1f0ef 893869d)
Merge commit 'dak-master/master' into dm_upload_allowed
authorMichael Casadevall <sonicmctails@gmail.com>
Mon, 29 Dec 2008 19:23:07 +0000 (14:23 -0500)
committerMichael Casadevall <sonicmctails@gmail.com>
Mon, 29 Dec 2008 19:23:07 +0000 (14:23 -0500)
commitd80d1f9473ed63a08404a23c04a9d8eabedc76a6
treea744fc858dbb303ab485787c54fbcf20e367a90ftree | snapshot
parent3b1f0efc3965793443da9260e8f80f895b7dccd1commit | diff
parent893869d15f5f10967b4cb6f69a580231d23b3253commit | diff
Merge commit 'dak-master/master' into dm_upload_allowed

Conflicts:

ChangeLog

Signed-off-by: Michael Casadevall <sonicmctails@gmail.com>
ChangeLog diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.