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

334e1c48 · intrigeri · 7685d6ac · b4f37415 · 334e1c48
Commit 334e1c48 authored Mar 22, 2015 by intrigeri
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -16,3 +16,4 @@ Discussions
 ===========

 - [[!tails_ticket 5613 desc="Document time sync failure"]]: Is it really needed?
+ - [[!tails_ticket 9047 desc="Tails trademark"]]: do we agree on this?