fix merge issue, package modified 3.6.0
authorJesse MacFadyen <purplecabbage@gmail.com>
Thu, 4 Sep 2014 15:59:18 +0000 (08:59 -0700)
committerJesse MacFadyen <purplecabbage@gmail.com>
Thu, 4 Sep 2014 15:59:18 +0000 (08:59 -0700)
commit7943002a55e730756c33a7440f2a87e7071b1aab
tree7f5be1a2e489c04d89ce6d8cce52ab50cae8c00e
parentf6690f1caab797da60fc018ec3464c465b14ff30
parent64a046e8305f8102ad165f16f046f03a372904b2
fix merge issue, package modified