]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 10 Oct 2009 00:16:46 +0000 (20:16 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 10 Oct 2009 00:16:46 +0000 (20:16 -0400)
commitf7ae61c8d2bb1645c476b69061015f7d43b8edfd
treed870118ef064ac8298fd115ecb5b2208fb15598f
parent74409f940d24f51a08becb626e266c91d40d69bd
parent36003bad0ad5746af841a0373ded1e271ae57840
Merge branch 'master' into dependency-types

Conflicts:
doc/bugs/transitive_dependencies.mdwn
debian/NEWS
debian/changelog
debian/postinst
doc/bugs/transitive_dependencies.mdwn
doc/todo/dependency_types.mdwn