commit 6fbf8d5befabd83f4260bf17d230d8b32ec42ec2
Merge: b9b4ac1 0b2bbad
Author: Elan Ruusamäe <[email protected]>
Date: Sat Oct 27 17:36:11 2012 +0300
Merge branch 'master' into new-builddir
Conflicts:
PLD_Builder/request.py
PLD_Builder/report.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/6fbf8d5befabd83f4260bf17d230d8b32ec42ec2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
