Changeset [0ea001fe6e85ab9ff6918198a5cb4ff2ea6c22cb] by Travis Tilley
Revision 0ea001fe6e85ab9ff6918198a5cb4ff2ea6c22cb,
committed by Travis Tilley
· January 17th, 2010 @ 01:19 AM
Merge remote branch 'wildfalcon/master' into integration
Conflicts:
lib/aasm/event.rb
lib/aasm/state.rb
http://github.com/rubyist/aasm/commit/0ea001fe6e85ab9ff6918198a5cb4...
5 changed files
-
M
lib/aasm/aasm.rb -
M
lib/aasm/event.rb -
M
lib/aasm/state.rb -
M
spec/unit/aasm_spec.rb -
M
spec/unit/state_spec.rb