]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'dependency-types'
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 13 Oct 2009 19:15:54 +0000 (15:15 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 13 Oct 2009 19:15:54 +0000 (15:15 -0400)
Conflicts:
doc/todo/dependency_types.mdwn

1  2 
doc/todo/dependency_types.mdwn

Simple merge