diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:51:10 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:51:10 +0200 |
| commit | b0e3717da09c28fe33bd86a00df83039eed705d2 (patch) | |
| tree | 957be5e148d7feb3b4b39b7713ffdfe62c1e965e /openid-selector | |
| parent | b01432549c31b47de2b4cd907585477df5fc4dbd (diff) | |
| parent | a3a014542bddda8ba54f45078232cceeadfa505b (diff) | |
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved):
Makefile
smiley
Diffstat (limited to 'openid-selector')
| m--------- | openid-selector | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/openid-selector b/openid-selector -Subproject b4852ae1f1905a285d69947d6352b6898303324 +Subproject 517a71e93b14812d722f000ab42a6e61cb7b402 |