diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 21:56:29 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 21:56:29 +0200 |
| commit | 4fb9600af4d836e61a341531507380465b715226 (patch) | |
| tree | 5923e697613268321fe8da3ad8536cc7b4ef5398 /feedlink.tmpl | |
| parent | 16dcd6d3af047971985cabce68d9e06b4a399fad (diff) | |
| parent | be3fe912791f7332374ca231422d3a06b05778e9 (diff) | |
Merge branch 'master' into master-da
Conflicts (merged manually):
editpage.tmpl
searchquery.tmpl
Pages translated as part of the merge:
editconflict.tmpl
editcreationconflict.tmpl
editfailedsave.tmpl
editpagegone.tmpl
renamesummary.tmpl
Diffstat (limited to 'feedlink.tmpl')
0 files changed, 0 insertions, 0 deletions