Fixes the issue in LP #1331744 comment #2
Updated fix
more fixing
wercker config file
Fix magic
wrong alias
wrong alias
9th time's the charm
Merge pull request #127 from davecheney/lp-1331744

Fixes the issue in LP #1331744 comment #2
Merge branch 'master' of https://github.com/juju/juju
Add conditional compilation directives to fix build on windows
Merge pull request #165 from wallyworld/windows-compile-error

Add conditional compilation directives to fix build on windows

Fix a compile error on windows.
Fix data race on Server.environUUID
remove wercker file
Fix data race on Server.environUUID
Merge branch '116-fix-apiserver-data-race' of github.com:davecheney/juju into 116-fix-apiserver-data-race
Merge pull request #166 from davecheney/116-fix-apiserver-data-race

116 fix apiserver data race

Fixes LP 1334500
Add new managed resources implementation
Code review fixes
Fix defer errors