Merge branch 'master' into australorp
authorJohn Napiorkowski <jjn1056@yahoo.com>
Mon, 2 Mar 2015 16:43:44 +0000 (10:43 -0600)
committerJohn Napiorkowski <jjn1056@yahoo.com>
Mon, 2 Mar 2015 16:43:44 +0000 (10:43 -0600)
commit772bd9deac85d462d77bfe2cbbe73f3de1688ebf
treea51de6ed7eae44f0c62a101a7c068ec49213211b
parentd91504e32dc14e87f6650b1835f1287cac40fe7e
parent4f04ee56cd0b7d1156d00b7b9771b39a6949002e
Merge branch 'master' into australorp

Conflicts:
Changes
lib/Catalyst.pm
lib/Catalyst/Runtime.pm
Changes
lib/Catalyst.pm