From: John Napiorkowski <jjn1056@yahoo.com>
Date: Mon, 27 Jul 2015 14:22:23 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/revmischa/catalyst-runtime into revmischa... 
X-Git-Tag: 5.90096~5^2
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=6ed75978febef041904175e1c319c2698568db28;hp=-c

Merge branch 'master' of https://github.com/revmischa/catalyst-runtime into revmischa-master
---

6ed75978febef041904175e1c319c2698568db28
diff --combined README.mkdn
index 3fcff0a,318faab..74be19d
--- a/README.mkdn
+++ b/README.mkdn
@@@ -14,11 -14,6 +14,11 @@@ Catalyst - The Elegant MVC Web Applicat
  See the [Catalyst::Manual](https://metacpan.org/pod/Catalyst::Manual) distribution for comprehensive
  documentation and tutorials.
  
 +    # Building Catalyst for development
 +    cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
 +    cpanm --installdeps --with-develop .
 +    perl Makefile.PL
 +
      # Install Catalyst::Devel for helpers and other development tools
      # use the helper to create a new application
      catalyst.pl MyApp
@@@ -2094,6 -2089,8 +2094,8 @@@ konobi: Scott McWhirter <konobi@cpan.or
  
  marcus: Marcus Ramberg <mramberg@cpan.org>
  
+ Mischa Spiegelmock <revmischa@cpan.org>
+ 
  miyagawa: Tatsuhiko Miyagawa <miyagawa@bulknews.net>
  
  mgrimes: Mark Grimes <mgrimes@cpan.org>