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

[Mamoru Tasaka]

commit 27e8e82f06e9f81f869549ddc55e8c10b18cb335
Merge: 36094db b3e7230
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Nov 4 02:55:13 2012 +0900

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

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