Merge branch 'openid2'
authorArt Cancro <ajc@uncensored.citadel.org>
Thu, 1 Dec 2011 17:44:25 +0000 (12:44 -0500)
committerArt Cancro <ajc@uncensored.citadel.org>
Thu, 1 Dec 2011 17:44:25 +0000 (12:44 -0500)
commit0a8720fa8985ad314591c0295d9d764a73701410
treef4efc84a91fbd2bd28903e2249373bf215935e03
parentf9c52de63b58d007291f0e33c035eeb10f728115
parent9b75e54a170bc310ba800e45e9ac00131114d3ad
Merge branch 'openid2'