Updated changelog
1.2.5
Merge branch 'saucy' into raring

Conflicts:
	debian/changelog