Merge "CREDITS: Update credits for Olle Johansson"
authorJoshua Colp <jcolp@digium.com>
Fri, 24 Apr 2015 15:33:12 +0000 (10:33 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 24 Apr 2015 15:33:12 +0000 (10:33 -0500)
commitb9514a17ba958a3e8c29f51f7dbdfc0d8043eb4c
tree43d3bfc21467c0facb36ab7b065199d29405c06e
parent61c8ae548ad8a789154f3be47ec2a743ccd6ae9e
parentcafdb7a0490c4431ce8f1b5ddd82f5571b203b20
Merge "CREDITS: Update credits for Olle Johansson"