[rubygem-glib2/f17: 2/2] Merge remote-tracking branch 'origin/master' into f17

[Mamoru Tasaka]

commit 14c5ac2b8c24351b1446c3c17b523295ceda9140
Merge: e181f30 c3ebe89
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Mon Dec 31 14:01:40 2012 +0900

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

 .gitignore         |    1 +
 rubygem-glib2.spec |    5 ++++-
 sources            |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---