From: Klaus Ethgen <Klaus@Ethgen.de>
Date: Sun, 26 Jan 2014 12:30:18 +0000 (+0100)
Subject: Merge remote-tracking branches 'origin/merge-requests/10' and 'origin/merge-requests/9'
X-Git-Tag: v1.2~6
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=de24ca6e169fc08e2bc6db1ee9054bd77b6623b0

Merge remote-tracking branches 'origin/merge-requests/10' and 'origin/merge-requests/9'

Merge in some trivial but useful merge requests. (Note that 9 includes 8.)

* origin/merge-requests/10:
  transifex config file allowing to easily use transifex-client

* origin/merge-requests/9:
  Skip over expanded keys.
  Annotate debug_exception() with source file, line, and function.
---

de24ca6e169fc08e2bc6db1ee9054bd77b6623b0