resolve conflicts

Blaise Laflamme

2013-08-14 ae61353610f947a03055fc0fd07b86f6c4809168

resolve conflicts

 CHANGES.txt

@@ -17,6 +17,10 @@
  instead of just a rendering of the macro.  See 
  https://github.com/Pylons/pyramid/issues/1013.  Backport from master.

- Fixed a Mako renderer bug returning a tuple with a previous defname value
  in some circumstances. See https://github.com/Pylons/pyramid/issues/1037 for
  more information.  Backport from master.

1.4.4 (2013-08-27)
==================

@@ -169,7 +173,7 @@
     @subscriber(SomeOtherEvent)
     def asubscriber(event):
         pass
 

  And you wanted to use a subscriber predicate::

     @subscriber([SomeEvent, SomeContextType], mypredicate=True)
@@ -243,7 +247,7 @@

     @subscriber([SomeContextType, SomeEvent])
     def asubscriber(event):
         # bzzt! you'll be getting the context here as ``event``, and it'll 
         # bzzt! you'll be getting the context here as ``event``, and it'll
         # be useless

  Existing multiple-argument subscribers continue to work without issue, so you
@@ -513,7 +517,7 @@
  https://github.com/Pylons/pyramid/issues/606
  https://github.com/Pylons/pyramid/issues/607

- In Mako Templates lookup, check for absolute uri (using mako directories) 
- In Mako Templates lookup, check for absolute uri (using mako directories)
  when mixing up inheritance with asset specs.
  https://github.com/Pylons/pyramid/issues/662

@@ -732,13 +736,13 @@
  * ``registerAdapter``, use
    ``pyramid.config.Configurator.registry.registerAdapter`` instead.

  * ``registerSubscriber``, use 
  * ``registerSubscriber``, use
    ``pyramid.config.Configurator.add_subscriber`` instead.

  * ``registerRoute``, use 
  * ``registerRoute``, use
    ``pyramid.config.Configurator.add_route`` instead.

  * ``registerSettings``, use 
  * ``registerSettings``, use
    ``pyramid.config.Configurator.add_settings`` instead.

- In Pyramid 1.3 and previous, the ``__call__`` method of a Response object