[comix/f17: 5/5] Merge remote-tracking branch 'origin/master' into f17

[Mamoru Tasaka]

commit 27c9bb7e0ca3128a6bb6b687a705e462b8b4bc39
Merge: d4cb252 660ce56
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Tue Dec 4 13:37:26 2012 +0900

    Merge remote-tracking branch 'origin/master' into f17

 comix-4.0.4-pathname2url-utf8.patch |   12 ++++++++++++
 comix.spec                          |   12 ++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---