Christian Bundy c73d556e6f Merge branch 'thilko' into destroy-castles ...

Conflicts:
	lib/homesick/actions.rb
	spec/homesick_spec.rb

2013-11-24 19:01:30 -08:00

..

actions.rb

Merge branch 'thilko' into destroy-castles

2013-11-24 19:01:30 -08:00

shell.rb

Shuffled some stuff out of main homesick.rb

2010-03-18 23:30:18 -04:00