[DRE-commits] [diaspora] 03/14: Merge tag 'upstream/0.5.2.0+debian'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository diaspora.

commit 863de8fdc71cb2e7c045d1416c974e6e4bf07ae5
Merge: 84585b6 bcfeafd
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Aug 2 17:10:54 2015 +0530

    Merge tag 'upstream/0.5.2.0+debian'
    
    Upstream version 0.5.2.0+debian
    
    # gpg: Signature made Sunday 02 August 2015 05:10:47 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 vendor/assets/javascripts/mbp-modernizr-custom.js | 15 ---------------
 vendor/assets/javascripts/mbp-respond.min.js      |  7 -------
 2 files changed, 22 deletions(-)

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