Bug 967705: upgrade buildapi + dependencies; r=rail
Merge branch 'master' of github.com:djmitche/releng-puppet
Merge branch 'master' of github.com:djmitche/releng-puppet
Merge branch 'master' of github.com:djmitche/releng-puppet
Merge branch 'master' of github.com:djmitche/releng-puppet
Merge branch 'master' of github.com:djmitche/releng-puppet