Merge branch 'master' of github.com:fontforge/fontforge
Merge branch 'master' of github.com:fontforge/fontforge
Merge remote-tracking branch 'upstream/master'
metricsview wordlist: remove the getline() call and convert over
to glib IO.
Merge pull request #870 from monkeyiq/2013oct/issues/718

metricsview wordlist: remove the getline() call and convert over to glib IO.
Merge branch 'master' of github.com:fontforge/fontforge
Collab: some more multi server support code. Plus a dialog letting
        you choose which local font server you wish to close.
Merge pull request #871 from monkeyiq/2013oct/issues/857

Collab: some more multi server support code.
Merge branch 'master' of github.com:coolwanglu/fontforge
Fix dangerous behavoir (returning pointer from the stack)
Merge branch 'master' of github.com:fontforge/fontforge
Merge branch 'master' of github.com:fontforge/fontforge
add travis.yml
.travis.yml
update .travis.yml
update .travis.yml
update .travis.yml
Merge branch 'master' of github.com:coolwanglu/fontforge
Merge pull request #874 from coolwanglu/master

Travis CI integration
Create README.md