[vlfeat] 42/44: Merge remote-tracking branch 'debian/experimental'

[Dima Kogan]

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

dkogan-guest pushed a commit to branch master
in repository vlfeat.

commit e5a313bfe7b9c653ebaf191ba30b9a47ba051316
Merge: 5008d49 5c8c89c
Author: Dima Kogan <dima at secretsauce.net>
Date:   Mon Aug 31 00:07:51 2015 -0700

    Merge remote-tracking branch 'debian/experimental'
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   |  8 +++++-
 debian/control                                     |  2 +-
 debian/copyright                                   |  6 ++---
 ...gle-adsense-and-google-analytics-from-the.patch | 29 ++++++++++++++++------
 4 files changed, 33 insertions(+), 12 deletions(-)

diff --cc debian/changelog
index 354d120,bafc23d..a4d53ad
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,6 +1,12 @@@
 +vlfeat (0.9.20+dfsg0-1) unstable; urgency=medium
 +
 +  * New upstream release
 +
 + -- Dima Kogan <dima at secretsauce.net>  Mon, 31 Aug 2015 00:05:46 -0700
 +
- vlfeat (0.9.19+dfsg0-1) unstable; urgency=medium
+ vlfeat (0.9.19+dfsg0-1) experimental; urgency=medium
  
+   [ Dima Kogan ]
    * New upstream release
    * Handling new target path behavior of mkoctfile. (Closes: #756222)
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vlfeat.git