From: Dan Scott <dan@coffeecode.net>
Date: Mon, 2 May 2011 11:37:48 +0000 (-0400)
Subject: Merge branch 'opac-tt-poc' into dbs/tt-opac-debrand
X-Git-Tag: sprint4-merge-nov22~5128^2~72^2~70
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a34bd6c164a40cff6c2a85397713fdbe38c0399e;p=working%2FEvergreen.git

Merge branch 'opac-tt-poc' into dbs/tt-opac-debrand

Conflicts:
	Open-ILS/web/templates/default/opac/parts/result/table.tt2
---

a34bd6c164a40cff6c2a85397713fdbe38c0399e