Merge branch 'master' of git://git.ikiwiki.info
authorJavier Rojas <jerojasro@devnull.li>
Mon, 19 Jul 2010 06:11:28 +0000 (01:11 -0500)
committerJavier Rojas <jerojasro@devnull.li>
Mon, 19 Jul 2010 06:11:28 +0000 (01:11 -0500)
commit194817b63d2241e8764f01ad64a2aaaa0b6bf5b3
tree7e6ed4db598577081d27617be76f530ff635f78d
parentcfed58f2908886c222c7305b1be4044de800fc6d
parent0ddc89123ebfa6b3b763e1a918b6d38282cee625
Merge branch 'master' of git://git.ikiwiki.info