From 9975192a2a9f2898ef0b6f9d308f9153c522ee6e Mon Sep 17 00:00:00 2001
From: Super-User <root@keepassx.(none)>
Date: Sat, 9 Jul 2011 14:22:24 +0200
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'upstream/master'