~jeremywootten/pantheon-files/various-fixes-part4

Viewing all changes in revision 2050.

Merge changes from trunk and parent, resolve conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: