Sat, 03 Dec 2016 12:49:53 +0100
Re-merged with the default branch.
glob:.eric5project glob:_eric5project glob:.eric6project glob:_eric6project glob:.ropeproject glob:_ropeproject glob:.directory glob:**.pyc glob:**.orig glob:**.bak glob:**Ui_*.py glob:**.rej glob:**~ glob:cur glob:tmp glob:__pycache__ glob:**.DS_Store glob:**.coverage glob:GPUCache glob:**Thumbs.db