Merge branch 'master' of git://git.jyujin.de/creidiki/fonts
commit94bfda9dd05dbf2fba1ab2b6691058c39843ca96
authorLeonardo Valeri Manera <lvalerimanera@gmail.com>
Mon, 28 Apr 2008 21:53:31 +0000 (28 23:53 +0200)
committerLeonardo Valeri Manera <lvalerimanera@gmail.com>
Mon, 28 Apr 2008 21:53:31 +0000 (28 23:53 +0200)
tree3f89ce5f2853f8acd5646f7d9e4227176e246b07
parent241cb93e105dd1906b1f8e4fa05b43b17b43e3c8
parentb8b72de1475d53fbc8c44f7f07e273dc7872c835
Merge branch 'master' of git://git.jyujin.de/creidiki/fonts

Conflicts:

profiles/categories
profiles/repo_name
profiles/repo_name