David Maloney 52a29856b3 Merge branch 'master' into staging/electro-release ... Conflicts: Gemfile Gemfile.lock		2014-07-16 09:38:44 -05:00
..
escalate	Missed an errant require	2013-11-05 14:00:55 -06:00
gather	Merge branch 'master' into staging/electro-release	2014-07-16 09:38:44 -05:00
general	Redo the boilerplate / splat	2013-10-15 13:51:57 -05:00
manage	Added newline at EOF	2014-06-17 21:03:18 +02:00