[med-svn] [salmon] 03/04: Merge tag 'upstream/0.4.2+ds1'

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository salmon.

commit 9de27d2420aa946c7bb87ddcca0d8378c795b94d
Merge: b23b2a6 a2657b1
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Wed Sep 30 23:06:40 2015 -0700

    Merge tag 'upstream/0.4.2+ds1'
    
    Upstream version 0.4.2+ds1

 doc/build/doctrees/building.doctree       | Bin 35989 -> 0 bytes
 doc/build/doctrees/environment.pickle     | Bin 6327 -> 0 bytes
 doc/build/doctrees/index.doctree          | Bin 5516 -> 0 bytes
 doc/build/html/.buildinfo                 |   4 -
 doc/build/html/_sources/building.txt      | 203 --------
 doc/build/html/_sources/index.txt         |  22 -
 doc/build/html/_static/ajax-loader.gif    | Bin 673 -> 0 bytes
 doc/build/html/_static/basic.css          | 537 --------------------
 doc/build/html/_static/comment-bright.png | Bin 3500 -> 0 bytes
 doc/build/html/_static/comment-close.png  | Bin 3578 -> 0 bytes
 doc/build/html/_static/comment.png        | Bin 3445 -> 0 bytes
 doc/build/html/_static/default.css        | 256 ----------
 doc/build/html/_static/doctools.js        | 238 ---------
 doc/build/html/_static/down-pressed.png   | Bin 368 -> 0 bytes
 doc/build/html/_static/down.png           | Bin 363 -> 0 bytes
 doc/build/html/_static/file.png           | Bin 392 -> 0 bytes
 doc/build/html/_static/jquery.js          |   2 -
 doc/build/html/_static/minus.png          | Bin 199 -> 0 bytes
 doc/build/html/_static/plus.png           | Bin 199 -> 0 bytes
 doc/build/html/_static/pygments.css       |  62 ---
 doc/build/html/_static/searchtools.js     | 622 -----------------------
 doc/build/html/_static/sidebar.js         | 159 ------
 doc/build/html/_static/underscore.js      |  31 --
 doc/build/html/_static/up-pressed.png     | Bin 372 -> 0 bytes
 doc/build/html/_static/up.png             | Bin 363 -> 0 bytes
 doc/build/html/_static/websupport.js      | 808 ------------------------------
 doc/build/html/building.html              | 284 -----------
 doc/build/html/genindex.html              |  93 ----
 doc/build/html/index.html                 | 129 -----
 doc/build/html/objects.inv                | Bin 206 -> 0 bytes
 doc/build/html/search.html                | 100 ----
 doc/build/html/searchindex.js             |   1 -
 32 files changed, 3551 deletions(-)

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