esrf-emotion/emotion — pull request #1 by mguijarr (2014-10-10 08:30:15+00:00)
Title: Github/master

Merge of github/master branch