Public Git Hosting - sgn.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: e44f96c 906dad1)

commit	814bd4664c25544dc0537ce3bd14c2d7f8a9cb5e
author	Jonathan "Duke" Leto <jonathan@leto.net>
	Thu, 24 Mar 2011 05:56:27 +0000 (23 22:56 -0700)
committer	Jonathan "Duke" Leto <jonathan@leto.net>
	Thu, 24 Mar 2011 05:56:27 +0000 (23 22:56 -0700)
tree	bfff340d78d98d70e846ef21cfac96211276ff15	tree \| snapshot (tar.gz zip)
parent	e44f96c5118f7f48d22a1648eb250bde0b04fd9d	commit \| diff
parent	906dad1024e534d37ead0e81dd77428afe14d2c2	commit \| diff

Merge remote-tracking branch 'origin/topic/stock_search'

Conflicts:
lib/SGN/Controller/AJAX/Stock.pm

lib/SGN/Controller/AJAX/Stock.pm	diff1 \|	diff2 \|	blob \| history
lib/SGN/Controller/Stock.pm	diff1 \|	diff2 \|	blob \| history

Sol Genomics Network