Merge branch 'profile-fields' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 15 Jan 2011 14:48:28 +0000 (15:48 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 15 Jan 2011 14:48:28 +0000 (15:48 +0100)
commit76e7a20f5212d9c202dbe92e958834ce3f99bd0e
treeb75b0d865dfb89ab5c35d35fa5ae9aa0e46926b4
parent6faf18302bb1bc89a80f9066be0a194ade37737e
parent185de79a70043437bde82017e79ad9dbb816c554
Merge branch 'profile-fields' into next
src/main/resources/static/javascript/sone.js