Talend/tdi-studio-se — pull request #35 by pbailly (2014-08-29 07:59:04+00:00)
Title: [TBD-896]

Fix merge error.