The haddoc/hscolour fix is pulled in, so that we don't have problems on master either (anymore). Also, the rapi doc build is fixed.
No conflicts :) commit a8dff20972303f48a94b58d93016982653524456 Merge: 777e8b6 2d6bdcc Author: Iustin Pop <[email protected]> Date: Fri Mar 8 16:10:42 2013 +0100 Merge branch 'devel-2.7' * devel-2.7: Change hbal behaviour in case of early exit Fix build/sphinx_ext.py with tuple defaults for op params Fix bug in man build rule Fix hscolour style sheet building Signed-off-by: Iustin Pop <[email protected]> -- thanks, iustin
