Burundi 's 12-year-civil war ended in 2004 .