Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 308435b7391d349b0077375409d631eb96038889 https://github.com/galaxyproject/galaxy/commit/308435b7391d349b0077375409d63... Author: John Chilton jmchilton@gmail.com Date: 2016-01-03 (Sun, 03 Jan 2016)

Changed paths: M lib/galaxy/tools/loader_directory.py

Log Message: ----------- Fix bug in db845fa1875bcb08aa2129830f1d405d1d894cfb.

Commit: 10677319f74f96160a4ee0b48e7d1053df242951 https://github.com/galaxyproject/galaxy/commit/10677319f74f96160a4ee0b48e7d1... Author: Daniel Blankenberg dan.blankenberg@gmail.com Date: 2016-01-03 (Sun, 03 Jan 2016)

Changed paths: M lib/galaxy/tools/loader_directory.py

Log Message: ----------- Merge pull request #1414 from jmchilton/lib_1

Fix bug in db845fa1875bcb08aa2129830f1d405d1d894cfb.

Compare: https://github.com/galaxyproject/galaxy/compare/73defd48ce70...10677319f74f