# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1409445466 25200
# Node ID c80a3be091da98f00ccb8e3a1be628f7d6a68ae5
# Parent  25bfed36a620d81d8c9ba8268bde005085e8737c# Parent  d9e494df2a994c2b9f44c0a69a2535cfb764b595
Merge changes.

diff -r 25bfed36a620 -r c80a3be091da piecrust/configuration.py
--- a/piecrust/configuration.py	Sat Aug 30 17:35:31 2014 -0700
+++ b/piecrust/configuration.py	Sat Aug 30 17:37:46 2014 -0700
@@ -124,7 +124,7 @@
     return config, offset
 
 
-class OrderedDictYAMLLoader(yaml.BaseLoader):
+class OrderedDictYAMLLoader(yaml.SafeLoader):
     """ A YAML loader that loads mappings into ordered dictionaries.
     """
     def construct_mapping(self, node, deep=False):