Merge branch 'master' into develop

Conflicts:
	README.md

core_me/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '6.6.0'
+__version__ = '6.7.0'
 __appname__ = 'dupeGuru Music Edition'

core_pe/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '2.8.0'
+__version__ = '2.9.0'
 __appname__ = 'dupeGuru Picture Edition'

help/changelog_me

@@ -1,3 +1,15 @@
+=== 6.7.0 (2013-12-08)
+
+* Disable symlink/hardlink deletion option when not relevant. (#247)
+* Make Cmd+A select all folders in the Folder Selection dialog. [Mac] (#228)
+* Make non-numeric delta comparison case insensitive. (#239)
+* Fix surrogate-related UnicodeEncodeError on CSV export. (#210)
+* Fixed crash on Dupe Count sorting with Delta + Dupes Only. (#238)
+* Improved documentation.
+* Important internal refactorings.
+* Dropped Ubuntu 12.04 and 12.10 support.
+* Removed the fairware dialog ([More Info](http://www.hardcoded.net/articles/phasing-out-fairware)).
+
 === 6.6.0 (2013-08-18)
 
 * Improved delta values to support non-numerical values. (#213)

help/changelog_pe

@@ -1,3 +1,16 @@
+=== 2.9.0 (2013-12-22)
+
+* Read RAW pictures EXIF tags. [Mac] (#234)
+* Disable symlink/hardlink deletion option when not relevant. (#247)
+* Make Cmd+A select all folders in the Folder Selection dialog. [Mac] (#228)
+* Make non-numeric delta comparison case insensitive. (#239)
+* Fix surrogate-related UnicodeEncodeError on CSV export. (#210)
+* Fixed crash on Dupe Count sorting with Delta + Dupes Only. (#238)
+* Improved documentation.
+* Important internal refactorings.
+* Dropped Ubuntu 12.04 and 12.10 support.
+* Removed the fairware dialog ([More Info](http://www.hardcoded.net/articles/phasing-out-fairware)).
+
 === 2.8.0 (2013-08-25)
 
 * Improved delta values to support non-numerical values. (#213)

help/changelog_se

@@ -7,6 +7,7 @@
 * Fixed crash on Dupe Count sorting with Delta + Dupes Only. (#238)
 * Improved documentation.
 * Important internal refactorings.
+* Dropped Ubuntu 12.04 and 12.10 support.
 * Removed the fairware dialog ([More Info](http://www.hardcoded.net/articles/phasing-out-fairware)).
 
 === 3.7.1 (2013-08-19)

hscommon/build.py

@@ -448,6 +448,8 @@ def collect_stdlib_dependencies(script, dest_folder, extra_deps=None):
     # There's a couple of rather big exe files in the distutils folder that we absolutely don't
     # need. Remove them.
     delete_files_with_pattern(op.join(dest_folder, 'distutils'), '*.exe')
+    # And, finally, create an empty "site.py" that Python needs around on startup.
+    open(op.join(dest_folder, 'site.py'), 'w').close()
 
 def fix_qt_resource_file(path):
     # pyrcc5 under Windows, if the locale is non-english, can produce a source file with a date