Merge branch 'mark-as-read' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 19 Jan 2011 18:12:40 +0000 (19:12 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 19 Jan 2011 18:12:40 +0000 (19:12 +0100)
Conflicts:
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java


No differences found