fix merge

This commit is contained in:
Peter Robinson 2012-01-21 13:05:34 +00:00
commit 1f937b9306

View File

@ -106,6 +106,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
* Sat Jan 21 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.8-1
- Update to 1.2.8
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Thu Aug 18 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.7-1
- Update to 1.2.7