From: Diane Trout <diane@caltech.edu>
Date: Thu, 26 May 2011 17:47:24 +0000 (-0700)
Subject: Merge branch 'add-condition'
X-Git-Tag: 0.5.2~35
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=51c342d45441249e1e70f8cb8825e0e06cd78895

Merge branch 'add-condition'

Conflicts:
	htsworkflow/frontend/templates/samples/library_detail.html

Resolve differences between the headers of library_detail for
adding RDFa and reordering the sample details.
---

51c342d45441249e1e70f8cb8825e0e06cd78895