From: Evan Prodromou <evan@status.net>
Date: Tue, 17 Nov 2009 11:25:07 +0000 (-0500)
Subject: Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6a1afda259c5223449f679a64f932e36df5ebe39;p=quix0rs-gnu-social.git

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

Conflicts:
	classes/statusnet.ini
---

6a1afda259c5223449f679a64f932e36df5ebe39
diff --cc classes/statusnet.ini
index 6a7be10080,8572ea8ac5..b2509dac5b
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@@ -542,4 -524,24 +542,4 @@@ created = 14
  modified = 384
  
  [user_group__keys]
--id = N
 -
 -[user_role]
 -user_id = 129
 -role = 130
 -created = 142
 -
 -[user_role__keys]
 -user_id = K
 -role = K
 -
 -[login_token]
 -user_id = 129
 -token = 130
 -created = 142
 -modified = 384
 -
 -[login_token__keys]
 -user_id = K
 -token = K
 -
++id = N