merged trunk into branch
authorAlexander Oppermann <a.oppermann@bgbm.org>
Tue, 9 Dec 2014 16:21:42 +0000 (16:21 +0000)
committerAlexander Oppermann <a.oppermann@bgbm.org>
Tue, 9 Dec 2014 16:21:42 +0000 (16:21 +0000)
commit13c5d3f034d13a7ffa2d9e7a8e3d7bb0d2f0cc2a
tree19a15e93be9d8bbe5593d6a2f29411096c2657ae
parent7add687272975d22a157d076c558a5c3b16ee6bf
parenta5e9f7de7116e068dff015ed7e66f413fb477ed2
merged trunk into branch
.gitattributes
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.navigation/plugin.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java