diff sickle.xml @ 10:341d297d8a85 default tip

Merge heads at 5:8a00afae9eca and 9:30f36c4faa39 which were created as a result of a recently fixed bug.
author devteam <devteam@galaxyproject.org>
date Mon, 13 Jan 2014 12:42:57 -0500
parents 7ebde7d1281c
children
line wrap: on
line diff