Merge branch 'master' into topic/strict_export_list
authorDave Rolsky <autarch@urth.org>
Mon, 7 Sep 2009 17:01:57 +0000 (12:01 -0500)
committerDave Rolsky <autarch@urth.org>
Mon, 7 Sep 2009 17:01:57 +0000 (12:01 -0500)
commitfa58afcc31067f2d236f4c79b5102e60b4fc287d
tree40ec161b4d0bb962e17c0697988192384b8ec729
parentaddd05f659a6c3c2349fac6197a1e94ead0af36f
parentec5383a0c4094867b6333fd8ea5693eedf112992
Merge branch 'master' into topic/strict_export_list

Conflicts:
t/010_basics/022_moose_exporter_groups.t