Merge branch 'master' of git://git.esilibrary.com/git/evergreen-equinox
authorDan Scott <gitorious@coffeecode.net>
Tue, 5 Apr 2011 02:03:26 +0000 (22:03 -0400)
committerDan Scott <gitorious@coffeecode.net>
Tue, 5 Apr 2011 02:03:26 +0000 (22:03 -0400)
commit8848ac46fdab85f2c32868522a90695ed43ff09c
treefb0aa91a550844195fbf8f3d899489e2539e72b6
parentd1fa8256e8145167a2029ba1fbf2256e07ac002b
parentcce75ff48f4ca21677816106519f703f89649098
Merge branch 'master' of git://git.esilibrary.com/git/evergreen-equinox