Merge remote-tracking branch 'origin/master' into dev

moonpyk · moonpyk · commit 4bd2f6a20078 · 2013-09-17T02:20:41.000+02:00
diff --git a/BRANCHES.txt b/BRANCHES.txt
@@ -0,0 +1,3 @@
+master : Contains stable and tested code, it's safe to checkout the code, and link your project directly against it, at any time (a nice alternative between official Nuget releases). Pull requests for bug fixes are welcome.
+---
+dev : Work in progress code, contributors should make their pull requests for new features on that branch. Regular merges are done back to master once code quality and stability standards are reached.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+master : Contains stable and tested code, it's safe to checkout the code, and link your project directly against it, at any time (a nice alternative between official Nuget releases). Pull requests for bug fixes are welcome.`
	`2`	`+---`
	`3`	`+dev : Work in progress code, contributors should make their pull requests for new features on that branch. Regular merges are done back to master once code quality and stability standards are reached.`