projects / lsb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c609eb2 10c0ad4)
Merge branch 'master-wheezy'
authorDidier Raboud <odyx@debian.org>
Wed, 15 May 2013 08:40:56 +0000 (10:40 +0200)
committerDidier Raboud <odyx@debian.org>
Wed, 15 May 2013 08:40:56 +0000 (10:40 +0200)
Conflicts:
debian/changelog


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.