Merge branch 'master' of git://git.esilibrary.com/git/evergreen-equinox
authorDan Scott <gitorious@coffeecode.net>
Thu, 7 Apr 2011 22:18:15 +0000 (18:18 -0400)
committerDan Scott <gitorious@coffeecode.net>
Thu, 7 Apr 2011 22:18:15 +0000 (18:18 -0400)
commita6b56fdd2df2c8137042a5a867bffabbee07e2ff
treec843de2f9363fa859bcd1ef9d37b16e6e7671efa
parentf97dc14ce18aaacd59092f11da36779409657502
parent26160d2208a0a7993b23de14b1ca8ffc2538907f
Merge branch 'master' of git://git.esilibrary.com/git/evergreen-equinox