Merge branch 'java_batching' of https://github.com/AppScale/appscale
Merge branch 'master' of https://github.com/AppScale/appscale
Merge branch 'master' of https://github.com/AppScale/appscale
fixes for GCE build and run
release number bump
Update RELEASE
Merge branch 'djinn-slave-restore' of https://github.com/nlake44/appscale
Reduced connection timeout.
Merge pull request #1546 from menivaitsi/timeout

Reduced connection timeout.
Merge branch 'bump-version' of git://github.com/AppScale/appscale into bump-version
version bump
Update bootstrap.sh
Update bootstrap.sh
Update bootstrap.sh
Merge pull request #1534 from AppScale/wheezy-build

fixes for GCE build and run
using correct pb type
Merge pull request #1547 from AppScale/tq

using correct pb type
Keep track of state of tasks
Merge pull request #1549 from nlake44/tq-state

Keep track of state of tasks
now providing stats on how man tasks are in a queue pending