]> www.infradead.org Git - users/mchehab/andors-trail.git/commit
Merge remote-tracking branch 'mchehab/master' into master
authorOskar Wiksten <oskar.wiksten@gmail.com>
Sun, 21 Oct 2012 16:43:39 +0000 (18:43 +0200)
committerOskar Wiksten <oskar.wiksten@gmail.com>
Sun, 21 Oct 2012 16:43:39 +0000 (18:43 +0200)
commitf3e044028f8b8abc8968ca62fbdd88f83597e4a9
tree21f59b45099f4bd54fcdfbf63926aff35abb8fde
parent32be42531b8041e2ec4181ffdabc2dbeb80de0c4
parent7b03118ea7dbb4bd1a481a80e2133050c0a03063
Merge remote-tracking branch 'mchehab/master' into master

Conflicts:
AndorsTrail/res/values/authors.xml
AndorsTrailEdit/AndorsTrailTranslations.js
AndorsTrail/res/values/authors.xml
AndorsTrailEdit/AndorsTrailTranslations.js