From 705b4a00ce7d127d80da87f96aca3210476978c0 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 2 Mar 2012 19:05:41 -0500
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  fix @mention autocomplete in comments
  template proc: fix variables regexp

* master: