]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of git://git.ikiwiki.info
authorJavier Rojas <jerojasro@devnull.li>
Mon, 13 Sep 2010 00:25:51 +0000 (19:25 -0500)
committerJavier Rojas <jerojasro@devnull.li>
Mon, 13 Sep 2010 00:25:51 +0000 (19:25 -0500)
commit9ab56b4ec8c99127afa74cbd3dac7f1f2fcae8d9
tree29d4cd176bc1787af004728e89d5311003461fa5
parentd2fbde0e814d873017ccc7d71eb585b9391dff9a
parent32a12f83f403ca5e1e2bfdb769b73141fab7f603
Merge branch 'master' of git://git.ikiwiki.info