Merge branch 'master' of https://vcs.maemo.org/git/comic-widget
authorMarcus Wikström <mece@ovi.com>
Fri, 29 Jan 2010 12:42:30 +0000 (14:42 +0200)
committerMarcus Wikström <mece@ovi.com>
Fri, 29 Jan 2010 12:42:30 +0000 (14:42 +0200)
commitca7a7ee273aa5c228da23fc1dfc9726f00a7e01a
treed683a55cf9268270d49d2e345e7763bf93368d1a
parent208f82b4cc7705f9d4ea6c4e708d8303b036c09a
parentfa620be8cd96b925078ea89b422befeb9f08fd2f
Merge branch 'master' of https://vcs.maemo.org/git/comic-widget

Conflicts:
db/.comicdb.sinfest.csv
db/.comicdb.sinfest.csv