Alex Dunae 40f393d529 Merge remote branch 'dgrambow/master' ... Conflicts: lib/holidays.rb		2010-11-12 12:26:48 -08:00
..
holidays	Add 'coding' header to Norwegian holidays	2010-03-04 00:56:47 -08:00
holidays.rb	Merge remote branch 'dgrambow/master'	2010-11-12 12:26:48 -08:00