[Pkg-owncloud-commits] [owncloud] 115/134: Merge pull request #8151 from owncloud/backport-8137-stable6

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit bf898f90bcc5b09edcfca2379394088b087ffaea
Merge: de7a386 fc8004d
Author: Bernhard Posselt <Raydiation at users.noreply.github.com>
Date:   Thu Apr 10 21:34:57 2014 +0200

    Merge pull request #8151 from owncloud/backport-8137-stable6
    
    add requirements to routing

 lib/private/appframework/routing/routeconfig.php | 10 ++++++-
 tests/lib/appframework/routing/RoutingTest.php   | 33 +++++++++++++++++++++---
 2 files changed, 38 insertions(+), 5 deletions(-)

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