On Tue, Mar 5, 2013 at 5:08 PM, Iustin Pop <[email protected]> wrote:
> Sorry, didn't know I'll finish this so early when I sent the first merge > request. > > commit f63e51d558768c087fe982c3826e647e04834e2a > Merge: 491d02c 099e921 > Author: Iustin Pop <[email protected]> > Date: Tue Mar 5 17:05:11 2013 +0100 > > Merge branch 'devel-2.7' > > * devel-2.7: > Update required pylint version > Constants.hs.in: improve Haddock markup in the template > convert-constants: generate better Haddock markup > Expand Haddock to run over test files as well > > Conflicts: > Makefile.am (curl changes and new hs directories) > > Signed-off-by: Iustin Pop <[email protected]> > LGTM, thanks. Michele
