[pkg-virtuoso] 05/07: Merge tag 'upstream/6.1.6+dfsg2'

[Maximiliano Curia]

This is an automated email from the git hooks/post-receive script.

maxy pushed a commit to branch master
in repository pkg-virtuoso.

commit 07e7e56357df6d52be65391af2cf4e94c08e1658
Merge: abad88d 7c02a47
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Sep 12 13:29:12 2014 +0200

    Merge tag 'upstream/6.1.6+dfsg2'

 appsrc/ODS-Framework/ckeditor/ckeditor.js          |  151 --
 appsrc/ODS-Framework/ckeditor/lang/en.js           |    6 -
 .../ckeditor/plugins/clipboard/dialogs/paste.js    |    7 -
 .../plugins/colordialog/dialogs/colordialog.js     |    7 -
 .../ckeditor/plugins/find/dialogs/find.js          |   10 -
 .../ckeditor/plugins/flash/dialogs/flash.js        |    9 -
 .../ckeditor/plugins/image/dialogs/image.js        |   13 -
 .../ckeditor/plugins/link/dialogs/anchor.js        |    6 -
 .../ckeditor/plugins/link/dialogs/link.js          |   12 -
 .../plugins/pastetext/dialogs/pastetext.js         |    6 -
 .../ckeditor/plugins/scayt/dialogs/options.js      |    8 -
 .../ckeditor/plugins/smiley/dialogs/smiley.js      |    7 -
 .../plugins/specialchar/dialogs/specialchar.js     |    7 -
 .../ckeditor/plugins/specialchar/lang/en.js        |    6 -
 .../ckeditor/plugins/styles/styles/default.js      |    6 -
 .../ckeditor/plugins/table/dialogs/table.js        |    9 -
 .../plugins/tabletools/dialogs/tableCell.js        |    8 -
 .../plugins/templates/dialogs/templates.js         |    7 -
 .../plugins/templates/templates/default.js         |    6 -
 .../ckeditor/plugins/wsc/dialogs/wsc.js            |    7 -
 appsrc/ODS-Framework/ckeditor/skins/kama/skin.js   |    7 -
 .../ODS-Framework/ckeditor/themes/default/theme.js |    8 -
 binsrc/oat/toolkit/OpenLayers.js                   | 2796 --------------------
 binsrc/samples/sparql_demo/syntax/shCore.js        |    1 -
 docsrc/chm/virtclientguide.chm                     |  Bin 10721 -> 0 bytes
 docsrc/chm/virtclientref.chm                       |  Bin 10721 -> 0 bytes
 26 files changed, 3110 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtuoso/pkg-virtuoso.git