Merge branch 'master' of git://git.ikiwiki.info
authorW. Trevor King <wking@drexel.edu>
Tue, 5 Oct 2010 13:35:58 +0000 (09:35 -0400)
committerW. Trevor King <wking@drexel.edu>
Tue, 5 Oct 2010 13:35:58 +0000 (09:35 -0400)
commit8555bb68f01e2aa95dad9c955aad5e957dee61da
tree802d464c6d57ac5930081544508c3e6e23cf40f9
parent38a0c4bbe9d95cb4c13cea0e74e4498f8b4b51e3
parentb02081b6f7de340372100227efc4b97d494b170f
Merge branch 'master' of git://git.ikiwiki.info