Merge remote-tracking branch 'origin/1.6'

Authored by kfunk on Feb 10 2014, 12:58 PM.

Description

Merge remote-tracking branch 'origin/1.6'

Details

Committed
kfunkFeb 10 2014, 12:58 PM
Parents
R32:8f4c04a1161a: Patch for bug 328307
R32:05093f20e844: SVN_SILENT made messages (.desktop file)
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
8f4c04a1161aDavid Stevens/kfunk
Patch for bug 328307 
Feb 9 2014
4837afac7027l10n daemon script
SVN_SILENT made messages (.desktop file) 
Feb 9 2014
526eb3e8448fkfunk
Grepview: Colorize the correct label on error 
Feb 5 2014