0000000000000000000000000000000000000000 b192e66f84ad5e760728c24dfaf6d244127e10a5 Robert Buels <rmb32@cornell.edu> 1254510999 -0700	branch: Created from origin/nmenda_integrate
b192e66f84ad5e760728c24dfaf6d244127e10a5 3d451bf1c54b3570493dce2b0424570e80fd75f9 Robert Buels <rmb32@cornell.edu> 1254511078 -0700	pull origin nmenda_integrate nmenda_integrate: Merge made by octopus.
3d451bf1c54b3570493dce2b0424570e80fd75f9 9315d0f254aaa17c930e9363e450711159047bb2 Robert Buels <rmb32@cornell.edu> 1254528342 -0700	commit: removed erroneously included workaround carried over from SGN code
9315d0f254aaa17c930e9363e450711159047bb2 09bf042210e2632ca55ca7f3e4841848171749ef Robert Buels <rmb32@cornell.edu> 1254528441 -0700	commit: generalized and extracted the organismprop/featureprop creation convenience methods into a Bio::Chado::Schema::Util module
09bf042210e2632ca55ca7f3e4841848171749ef b0ffd4d95dd4ba8da23e701a9410b201577b4cdf Robert Buels <rmb32@cornell.edu> 1254528506 -0700	commit: added dependencies on Carp::Clan, and recent version of Carp to Build.PL
b0ffd4d95dd4ba8da23e701a9410b201577b4cdf 6bfd6c63704b8503b5af3ec4380eb26df11cce33 Robert Buels <rmb32@cornell.edu> 1264560695 -0800	merge master: Fast forward
6bfd6c63704b8503b5af3ec4380eb26df11cce33 0c3312978f8a227022a0ae7b78963a1ee41807c1 Robert Buels <rmb32@cornell.edu> 1264560753 -0800	pull naama master: Merge made by recursive.
0c3312978f8a227022a0ae7b78963a1ee41807c1 6bfd6c63704b8503b5af3ec4380eb26df11cce33 Robert Buels <rmb32@cornell.edu> 1264561025 -0800	HEAD^: updating HEAD
6bfd6c63704b8503b5af3ec4380eb26df11cce33 ae698b1c96edb20b8301a534990b5913274ccf7a Robert Buels <rmb32@cornell.edu> 1264561036 -0800	rebase finished: refs/heads/nmenda_int onto ab3e7b509b678312ff1951104ec075670a43f96c
ae698b1c96edb20b8301a534990b5913274ccf7a e2ae2744b6d848b84b664d4d3ada0612868dc7e7 Robert Buels <rmb32@cornell.edu> 1264561195 -0800	commit: cleaned up naama stray whitespace
e2ae2744b6d848b84b664d4d3ada0612868dc7e7 4e89f8defd6c32e3d0aaa410428ebef2a68d5b74 Robert Buels <rmb32@cornell.edu> 1264576165 -0800	commit: made cvterm creation function take either names OR objects, renamed it to create_with(), moved it into a custom ResultSet subclass for Cvterms, cleaned up tests
4e89f8defd6c32e3d0aaa410428ebef2a68d5b74 ba3dc306123a3d3283c3d567e92d026a4497a8fa Robert Buels <rmb32@cornell.edu> 1265937849 -0800	merge naama/master: Fast forward
ba3dc306123a3d3283c3d567e92d026a4497a8fa 4ae07cde037c7920d1011fcb54bb51d859694f93 Robert Buels <rmb32@cornell.edu> 1265938284 -0800	commit: cleaned up trailing whitespace
4ae07cde037c7920d1011fcb54bb51d859694f93 49806570a27e0a0d355677426078c6a0d50beb42 Robert Buels <rmb32@cornell.edu> 1265938302 -0800	commit: corrected test skip count
49806570a27e0a0d355677426078c6a0d50beb42 cc79b0e896f394f8d2d9061afbfbd7c5bd1f63ee Robert Buels <rmb32@cornell.edu> 1265938459 -0800	commit: bugfix to failing tests
cc79b0e896f394f8d2d9061afbfbd7c5bd1f63ee 390908d2d0fd37c588710c6b335b2afd49d21cad Robert Buels <rmb32@cornell.edu> 1265938464 -0800	commit (amend): wrong rel name
390908d2d0fd37c588710c6b335b2afd49d21cad 0b7efd63d65989d33db9d28c1a9d9f519058ece5 Robert Buels <rmb32@cornell.edu> 1265942048 -0800	commit: fleshed out and tweaked feature test
