[DRE-commits] [origami] 18/19: Merge tag 'upstream/1.2.7'

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository origami.

commit 84d54ce1a019d8be32d482e5d6522da42c14ea76
Merge: 89befd3 280fd7e
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Thu Nov 6 22:08:15 2014 -0200

    Merge tag 'upstream/1.2.7'
    
    Upstream version 1.2.7
    
    # gpg: Signature made Qui 06 Nov 2014 22:08:12 BRST using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"

 .hgtags                      |   1 -
 Rakefile.rb                  |   2 +-
 lib/origami.rb               |   2 +-
 samples/flash/helloworld.swf | Bin 68545 -> 0 bytes
 4 files changed, 2 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/origami.git