Merge branch 'master' of git://git.esilibrary.com/git/evergreen-equinox
authorDan Scott <gitorious@coffeecode.net>
Wed, 6 Apr 2011 00:39:22 +0000 (20:39 -0400)
committerDan Scott <gitorious@coffeecode.net>
Wed, 6 Apr 2011 00:39:22 +0000 (20:39 -0400)
commit69da90b92b54245a643f5301f4e6665748885385
treec403311ad77f00a6133c51a241bc0343204ac9be
parent8848ac46fdab85f2c32868522a90695ed43ff09c
parentf6f578d465ca188b0e3d89bf6ff917eb6ccf069f
Merge branch 'master' of git://git.esilibrary.com/git/evergreen-equinox