Merge remote-tracking branch 'origin/master'

Urigo · Urigo · commit 094e26f20adf · 2014-12-22T14:24:03.000+02:00
diff --git a/.docs/angular-meteor/public/googleafc0ead345b33618.html b/.docs/angular-meteor/public/googleafc0ead345b33618.html
@@ -0,0 +1 @@
+google-site-verification: googleafc0ead345b33618.html

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+google-site-verification: googleafc0ead345b33618.html`