Improve referer based API include
Resize based on outer window size. Fixes issue #58
Merge remote-tracking branch 'origin/master' into issue-58-resize-window
Merge pull request #107 from mozilla/issue-58-resize-window

Issue 58 resize window
Update server/views/error.ejs

System Error instead of Systems Error. What do you think?
Merge pull request #108 from mathjazz/patch-1

Update server/views/error.ejs
Merge branch 'master' of github.com:mozilla/browserid-bigtent
Merge branch 'train-2013.01.17'
Adding example locale_directory
Merge branch 'train-2013.01.17'
Adds http_proxy to configuration. Fixes Issue#109
Merge branch 'master' of github.com:mozilla/browserid-bigtent into train-2013.01.17
Pickup up openid tweak to test
Merge branch 'train-2013.01.17' of github.com:mozilla/browserid-bigtent into train-2013.01.17