From cfdb2979cb5caac7806d993f63844c1314e2cdfa Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 27 Mar 2012 00:54:47 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  @-completion bug
  qcomment enhancements
  theme description with preview (non-translatable unfortunately)
  preparation for some possibly killer features
  translate br with extra elements
  revup
  Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland, Spain, and the UK.

* master: