Merge remote-tracking branch 'cybergeek94/master' into update-rustc

Conflicts:
	examples/support/mod.rs
	src/lib.rs
	tests/headless.rs

1 files changed, 0 insertions, 1 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 4f4f86e..0934f86 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,4 @@
 #![feature(unsafe_destructor)]
-#![feature(phase)]
 #![unstable]
 
 //! The purpose of this library is to provide an OpenGL context on as many