Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

2009-12-29 12:48:59 -08:00 · 2009-12-29 12:48:59 -08:00 · a1b130541b
commit a1b130541b
parent 05e2b4d92d e152bec282
1 changed files with 1 additions and 1 deletions
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@ -572,5 +572,5 @@ created = 142
 modified = 384

 [user_location_prefs__keys]
-user_id = N
+user_id = U