[lucene4.10] 06/24: Merge tag 'upstream/4.6.1+dfsg'

[Hilko Bengen]

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

bengen pushed a commit to branch master
in repository lucene4.10.

commit 04c6503bc8c5a0f0baa91c2e04c7997cfa463cd1
Merge: b9b1fe4 1f94af0
Author: Hilko Bengen <bengen at debian.org>
Date:   Thu Sep 4 11:04:51 2014 +0200

    Merge tag 'upstream/4.6.1+dfsg'
    
    Upstream version 4.6.1+dfsg

 tools/prettify/lang-apollo.js | 18 ------------------
 tools/prettify/lang-css.js    | 18 ------------------
 tools/prettify/lang-hs.js     | 18 ------------------
 tools/prettify/lang-lisp.js   | 19 -------------------
 tools/prettify/lang-lua.js    | 18 ------------------
 tools/prettify/lang-ml.js     | 18 ------------------
 tools/prettify/lang-proto.js  | 17 -----------------
 tools/prettify/lang-sql.js    | 18 ------------------
 tools/prettify/lang-vb.js     | 18 ------------------
 tools/prettify/lang-wiki.js   | 18 ------------------
 tools/prettify/prettify.css   | 17 -----------------
 tools/prettify/prettify.js    | 44 -------------------------------------------
 12 files changed, 241 deletions(-)

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