Merge branch 'pu/2013.10-downloadlink'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:12:04 +0000 (19:12 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:12:04 +0000 (19:12 +0200)
commit04e8c84ded6b348e81535890b6291446c9700d75
tree9a2a36d171b3422bdec9f4c518646d1580c4029c
parenta1335644013a7f335278f7ec2d4efcc381654b7c
parent66a6ca4dbebd5484835428320f3f73a2f658f66f
Merge branch 'pu/2013.10-downloadlink'

Conflicts:
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot

Change-Id: Ieda5befe8a925ac1d4edd3118d874b0b2b3f21c1
tine20/Filemanager/js/NodeGridPanel.js
tine20/Tinebase/Model/Tree/Node.php
tine20/Tinebase/js/widgets/tree/ContextMenu.js
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot