[libmagpie-perl] 01/02: Merge tag 'upstream/1.141660'

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository libmagpie-perl.

commit 2d446f7c6e765211f0917b86b5ef8ff34ba5ffd6
Merge: 76eba50 9923a6c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jul 1 17:05:28 2014 +0200

    Merge tag 'upstream/1.141660'
    
    Upstream version 1.141660
    
    # gpg: Underskrift lavet tir 01 jul 2014 17:05:27 CEST
    # gpg:                bruger RSA nøgle 0x4EC1B722374F9BD6
    # gpg: udfør venligst en --check-trustdb
    # gpg: God underskrift fra »Jonas Smedegaard <dr at jones.dk>« [ultimativ]
    # gpg:        også kendt som »Jonas Smedegaard <jonas at homebase.dk>« [ultimativ]
    # gpg:        også kendt som »Jonas Smedegaard <js at debian.org>« [ultimativ]
    # gpg:        også kendt som »Jonas Smedegaard <jonas at dgi-huset.dk>« [ultimativ]
    # gpg:        også kendt som »Jonas Smedegaard <jonas at 107b.dk>« [ultimativ]
    # gpg:        også kendt som »[jpeg image of size 4165]« [ultimativ]

 MANIFEST                                     |   1 -
 META.yml                                     |   2 +-
 Makefile.PL                                  |   2 +-
 README                                       |   2 +-
 lib/Magpie.pm                                |   4 +-
 lib/Magpie/Breadboard.pm                     |   4 +-
 lib/Magpie/Component.pm                      |   4 +-
 lib/Magpie/Component/ContentCache.pm         |   4 +-
 lib/Magpie/ConfigReader/XML.pm               |   6 +-
 lib/Magpie/Constants.pm                      |   4 +-
 lib/Magpie/Dispatcher/Env.pm                 |   4 +-
 lib/Magpie/Dispatcher/RequestMethod.pm       |   4 +-
 lib/Magpie/Dispatcher/RequestParam.pm        |   4 +-
 lib/Magpie/Error.pm                          |   4 +-
 lib/Magpie/Error/Simplified.pm               |   4 +-
 lib/Magpie/Event.pm                          |   4 +-
 lib/Magpie/Event/Symbol.pm                   |   4 +-
 lib/Magpie/Intro.pod                         |   4 +-
 lib/Magpie/Machine.pm                        |   4 +-
 lib/Magpie/Manual/Config.pod                 |   4 +-
 lib/Magpie/Matcher.pm                        |   4 +-
 lib/Magpie/Plugin/DBI.pm                     |   4 +-
 lib/Magpie/Plugin/Resource/Cache.pm          |   4 +-
 lib/Magpie/Plugin/URITemplate.pm             |   4 +-
 lib/Magpie/Resource.pm                       |   4 +-
 lib/Magpie/Resource/Abstract.pm              |   4 +-
 lib/Magpie/Resource/DBIC.pm                  |   6 +-
 lib/Magpie/Resource/DBIxClass.pm             | 325 ---------------------------
 lib/Magpie/Resource/File.pm                  |   4 +-
 lib/Magpie/Resource/Kioku.pm                 |  12 +-
 lib/Magpie/Resource/Proxy.pm                 |   4 +-
 lib/Magpie/SymbolTable.pm                    |   4 +-
 lib/Magpie/Transformer.pm                    |   4 +-
 lib/Magpie/Transformer/JSON.pm               |   4 +-
 lib/Magpie/Transformer/Middleware.pm         |   4 +-
 lib/Magpie/Transformer/ServiceUnavailable.pm |   4 +-
 lib/Magpie/Transformer/TT2.pm                |   4 +-
 lib/Magpie/Transformer/XSLT.pm               |   4 +-
 lib/Magpie/Transformer/XSP.pm                |   4 +-
 lib/Magpie/Types.pm                          |  21 +-
 lib/Magpie/Util.pm                           |   4 +-
 lib/Plack/Middleware/Magpie.pm               |   4 +-
 42 files changed, 101 insertions(+), 408 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmagpie-perl.git