Merge branch 'next' into profile-fields
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 12 Jan 2011 12:44:07 +0000 (13:44 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 12 Jan 2011 12:44:07 +0000 (13:44 +0100)
commit8c251a1b15c1d8a8a2766e55e6decf10e9330bbe
treecc5ce4de0c9f45a394042241b2a607b87832d9e8
parent110f9baa87db5758cc6fee3951d8096f569e6166
parente234898b050cac1c9b2223fba60eb75a7b8ad90c
Merge branch 'next' into profile-fields
src/main/java/net/pterodactylus/sone/web/EditProfilePage.java