Merge branch 'auth-api' into couchdb
commite27d9e824df44a13d41007e1bedd129b29a66505
authorStefan Kögl <stefan@skoegl.net>
Sat, 27 Aug 2011 08:27:17 +0000 (27 10:27 +0200)
committerStefan Kögl <stefan@skoegl.net>
Sat, 27 Aug 2011 08:27:17 +0000 (27 10:27 +0200)
treef706fdbfa581cc943df0530ae7c864c7187ba1b9
parentfce640970fcdbc0360e482dd3170fa62d061d80d
parent4ed83ca060285bcd6b3add14d42fe542c26bd7ea
Merge branch 'auth-api' into couchdb