[rubygem-cairo/f18: 2/2] Merge remote-tracking branch 'origin/master' into f18

[Mamoru Tasaka]

commit f5bd66addad168513a7e2cde82715b3c20ad5ae6
Merge: f2fbb55 fb267c1
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Thu Dec 6 13:41:41 2012 +0900

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

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---