Merge branch 'debug-i18n' of ssh://houllier/home/carl/git/dvdomatic into debug-i18n
authorCarl Hetherington <cth@carlh.net>
Mon, 15 Apr 2013 20:36:51 +0000 (21:36 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 15 Apr 2013 20:36:51 +0000 (21:36 +0100)
commit1a0a739dab3a8c6f43116e7893d548cb9cde2695
treea9f15144cafcf782b7763a79aa2ac6d9910302b6
parent6af565127a4d4a2eb894c151af666a8ad1a15a9a
parent9c0a99398dac9cd46b7eb2ca50c0182987954f78
Merge branch 'debug-i18n' of ssh://houllier/home/carl/git/dvdomatic into debug-i18n