# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Dannon Baker dannon.baker@emory.edu # Date 1277490919 14400 # Node ID 71b1a5920fc12514a9e151770eaf250d6fc6da46 # Parent c02ecbcc8dab54e7007b35db5a05e31211d77b01 # Parent d666e89f178eddb4175c388e81d8758096de72df Merge.