Merge branch 'no-norsk' into 2013-01-09-fixes

This commit is contained in:
Amir E. Aharoni
2013-01-09 13:13:19 +02:00
2 changed files with 3 additions and 2 deletions

File diff suppressed because one or more lines are too long