Merge branch 'user/tsbere@mvlc.org/build_version' of git.evergreen-ils.org:working...
authorMike Rylander <mrylander@gmail.com>
Wed, 25 May 2011 14:12:05 +0000 (10:12 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 25 May 2011 14:12:05 +0000 (10:12 -0400)
commitf91c4e5387b29f9e08f5f053df621dadc4457e10
tree849930cef1b16e8b56424e5aa0f1368cd6251258
parent99000e3c385d2912955f3eadbffe50a011cac698
parent48ac619f702f10feabdc7562a78311ff796253c2
Merge branch 'user/tsbere@mvlc.org/build_version' of git.evergreen-ils.org:working/Evergreen into build_version