Merge branch 'master' into openidselector
authorJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 01:25:04 +0000 (21:25 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 01:25:04 +0000 (21:25 -0400)
commita4b432f543089b23f6a2fee8c8a58e17b23894fe
tree5d7f05f94a0c895e57bbf6340a35b4db0ba10d0b
parentede2d1b46de45122c5cc81cd6e7e1131007ce93d
parente196bd3f3a2b1b48fbd19f1014bf03b044c4e829
Merge branch 'master' into openidselector