[Pkg-debile-commits] [debile-web] 05/06: Merge remote-tracking branch 'origin/master' into with-apt

[Léo Cavaillé]

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

leo.cavaille-guest pushed a commit to branch master
in repository debile-web.

commit fa9826b85d1c3f725d5101e405b00a600b0b9e9b
Merge: d2da028 c2148b8
Author: Lucy manager <lucy at irill1.inria.fr>
Date:   Sat Aug 17 11:56:00 2013 +0200

    Merge remote-tracking branch 'origin/master' into with-apt

 Makefile                                   |    2 +-
 PACKAGING                                  |   16 ++++++++--------
 app.py                                     |    2 +-
 debile/__init__.py                         |    4 ++++
 {debuild => debile}/blueprints/__init__.py |    0
 {debuild => debile}/blueprints/frontend.py |    0
 {debuild => debile}/core.py                |    0
 debuild/__init__.py                        |    4 ----
 less/Makefile                              |    4 ++--
 less/{debuild.me.less => debile.less}      |    0
 setup.py                                   |    6 +++---
 templates/base.html                        |    8 ++++----
 templates/source.html                      |   10 +++++-----
 13 files changed, 28 insertions(+), 28 deletions(-)


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