Merge branch 'master' of git://git.esilibrary.com/git/evergreen-equinox
authorDan Scott <gitorious@coffeecode.net>
Thu, 21 Apr 2011 03:49:20 +0000 (23:49 -0400)
committerDan Scott <gitorious@coffeecode.net>
Thu, 21 Apr 2011 03:49:20 +0000 (23:49 -0400)
commit8b6529ae26255d6f3047284bf99abd1750d23331
tree06ae8057f88f4b25344864f35c4e096267c41870
parentb23949bdaade4904d0e27d7a62a1b5adcac21b0a
parentf69e07fea68f2ad33e43c92c92991b4653b0e0b7
Merge branch 'master' of git://git.esilibrary.com/git/evergreen-equinox