Merge remote-tracking branch 'freyja/master'

samvtran · Apr 11, 2013 · 3608538 · 3608538
2 parents d71eab7 + e03b783
commit 3608538
Show file tree

Hide file tree

Showing 19 changed files with 1,879 additions and 2,014 deletions.
diff --git a/data/media/48/appearance-settings-cursor.svg b/data/media/48/appearance-settings-cursor.svg
diff --git a/data/media/48/appearance-settings-font.svg b/data/media/48/appearance-settings-font.svg