fixing merge conflicts from master
authorAndré Walker <andre@andrewalker.net>
Fri, 29 Jun 2012 21:01:18 +0000 (18:01 -0300)
committerAndré Walker <andre@andrewalker.net>
Fri, 29 Jun 2012 21:01:18 +0000 (18:01 -0300)
commit6ac0784b4442b46abae68c76318c2189221e725d
treebe67e315f137364aae3525bb9b8aa0ab0ae0c93d
parent344858a720ae4deadd0bd67569a8880984690d28
fixing merge conflicts from master
t/lib/TestApp.pm