Squashed 'qr/' changes from 650dc42..f0567ce

f0567ce updated svg doctype
88ed269 updated the merged lib
13945af removed force attachment since it can break bc
5951346 * fixed issue https://github.com/t0k4rt/phpqrcode/issues/9#issuecomment-45410361 * no needs to echo to get content, qrcode:svg return directly a svg file * removed header('Content-Disposition: filename="'.$filename.'"'); since it prevents users from changing headers with content type attachment These changes should not induce bc break

git-subtree-dir: qr
git-subtree-split: f0567ce717fa1172cb66c48ebae017a094de64b1
Use their versions with Linux line endings
Squashed 'twilio/' changes from 389e07e..9d8bb7d

9d8bb7d Bump
66037cd Merge branch 'addresses'
3a34104 bump to 3.12.7
b3064e1 Merge pull request #10 from twilio/tokens
382c2cc add tokens support
b20b28a Merge branch 'master' of github.com:twilio/twilio-php
723d46b Bump to 3.12.6
79a1cfe FORMATTING
159960c Support Call/Message deletion/redaction
2ec5b23 Merge pull request #198 from twilio/remove-pinned-certs
ab4a09f Update FAQ about SSL
318c240 Remove SSL certificates to eliminate headaches once and for all
9375c92 Add Addresses resource
51ab292 bump version in package.php
08972c6 bump version to 3.12.6
1824a3c Merge branch 'call-feedback' of github.com:twilio/php-private into call-feedback
3e3557a Merge branch 'master' into call-feedback
1316c50 Merge branch 'master' of github.com:twilio/twilio-php
17eab1e Add missing new lines
cd27f14 Re-implement call feedback summary
a876df2 Changing channel from twilio.github.com to twilio.github.io
be6b2ee Version Bump to 3.12.5
659d8b3 Version Bump to 3.12.5
bdcf5b7 Version Bump to 3.12.5
d9e4571 Version Bump to 3.12.5
43d24b7 Update AUTHORS.md
47d505b Update CHANGES.md
f32ca65 Merge pull request #173 from tacman/patch-1
f902882 I'm an author.
c40bebf Add Calls Feedback sub resource.
216e4c8 Remove Calls FeedbackSummary.
23b01ed Change class name to match filename
5b2dabc use actual instances for Feedback and Summary
bce883a add Feedback and Summary endpoints
d8a03cd add subresources
18c0233 more pear server fixes
f9a1e2c pear server moved

git-subtree-dir: twilio
git-subtree-split: 9d8bb7dad58dc52fc4cbc1f0e905950ad839ca73
Merge commit '00db480b8ba95b019b47651e73c22fc71dfdbf06'
Update bower