[joptsimple] 01/03: Merge branch 'upstream'

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository joptsimple.

commit cff3474a0bd10eeeb10a9e46f1e2dc16a5fd2811
Merge: a6cce9a 4ca8af1
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sun Dec 15 20:10:52 2013 -0300

    Merge branch 'upstream'

 src/site/apt/acknowledgments.apt               |   80 ++
 src/site/apt/changes.apt                       |  274 ++++
 src/site/apt/download.apt.vm                   |   26 +
 src/site/apt/examples.apt                      |  431 +++++++
 src/site/apt/index.apt                         |   69 +
 src/site/resources/css/prettify.css            |   49 +
 src/site/resources/images/jopt-simple-logo.png |  Bin 0 -> 7147 bytes
 src/site/resources/scripts/prettify.js         | 1602 ++++++++++++++++++++++++
 src/site/site.xml                              |   19 +
 9 files changed, 2550 insertions(+)

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