Merge remote-tracking branch 'upstream/stable' into build_number

hollie · Oct 27, 2013 · b8ba77d · b8ba77d
2 parents 3a12b90 + b3ba252
commit b8ba77d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -5,4 +5,4 @@ Perl open source home automation program. It's fun, it's free, and it's entirely
 
 A quickstart guide is documented [here](https://github.com/hollie/misterhouse/wiki/Getting-started).
 
-The MisterHouse wiki with more information is located here: http://misterhouse.wikispaces.com/
+The MisterHouse wiki with more information is located here: http://misterhouse.wikispaces.com/
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-unstable
+3.0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,4 @@ Perl open source home automation program. It's fun, it's free, and it's entirely

		A quickstart guide is documented [here](https://github.com/hollie/misterhouse/wiki/Getting-started).

		The MisterHouse wiki with more information is located here: http://misterhouse.wikispaces.com/
		The MisterHouse wiki with more information is located here: http://misterhouse.wikispaces.com/