diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2012-08-04 19:50:34 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2012-08-04 19:50:34 +0200 |
| commit | 22dc919a2940bf620f211e50b0ad4f7590b4d6eb (patch) | |
| tree | 2fa9da7dd63d3cfef5238dc59372f5d2c792bd14 /smiley | |
| parent | a3edb3db1699c2fe280bd4e26a2806c2a7d6413e (diff) | |
| parent | ccc9976fb7916bce057165c5cbab7c38a8e91945 (diff) | |
Merge branch 'master' into master-da
Conflicts:
basewiki
include.mk
openid-selector
osm
templates
Diffstat (limited to 'smiley')
0 files changed, 0 insertions, 0 deletions