tree 1232e3bec8dd894c8abf07346217db94e3715d93
parent 7be7195c9dceced67c745aa9e01b01b0b97d1687
parent ae0ec6a4c8442ca22ca1edee47559a09637d416a
author chalepad <dimitrios.chalepakis@pta.de> 1505489767 +0200
committer chalepad <dimitrios.chalepakis@pta.de> 1505489767 +0200

Merge branch 'DEVELOP_FE' of ssh://git.eclipse.org:29418/elogbook/elogbookFE into DEVELOP_FE