Merge branch 'master' of github.com:mbklein/openils-mapper
authorMichael Klein <KleinM@KleinM-APiM24.library.oregonstate.edu>
Wed, 3 Mar 2010 21:25:33 +0000 (13:25 -0800)
committerMichael Klein <KleinM@KleinM-APiM24.library.oregonstate.edu>
Wed, 3 Mar 2010 21:25:33 +0000 (13:25 -0800)
commitd85048c190e1d84ec7215e791e19c9bcdcc61960
tree88321064d71267dfcb89724a6ac8efa75ce39ca4
parent68eeeb126d34fae3b4b6a284749a5005601d1cda
parent5c29056b08e7204f2d386a58fbc2269467879527
Merge branch 'master' of github.com:mbklein/openils-mapper