From: Zach Copley <zach@controlyourself.ca>
Date: Fri, 3 Apr 2009 22:53:50 +0000 (-0700)
Subject: Merge branch '0.7.x' of git://gitorious.org/laconica/ksedgwic-clone into review/0.7.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=92f9ec1580178e2a2bcc6409f1cd9fba327bce03;p=quix0rs-gnu-social.git

Merge branch '0.7.x' of git://gitorious.org/laconica/ksedgwic-clone into review/0.7.x
---

92f9ec1580178e2a2bcc6409f1cd9fba327bce03
diff --cc scripts/laconica.spec
index 5f0ed5fa92,502959fb1d..0e51237a24
--- a/scripts/laconica.spec
+++ b/scripts/laconica.spec
@@@ -74,9 -79,12 +79,15 @@@ rm -rf %buildroo
  %config(noreplace) %{_sysconfdir}/httpd/conf.d/laconica.conf
  
  %changelog
+ * Fri Mar 13 2009 Ken Sedgwick <ksedgwic@bonsai.com> - 0.7.2.1-1
+ - Factored laconica version to the first line of the file.
+ 
+ * Wed Mar 03 2009 Zach Copley <zach@controlyourself.ca> - 0.7.2
+ - Changed version number to 0.7.2.
+ 
 +* Wed Mar 03 2009 Zach Copley <zach@controlyourself.ca> - 0.7.2
 +- Changed version number to 0.7.2.
 +
  * Sat Feb 28 2009 Ken Sedgwick <ken@bonsai.com> - 0.7.1-1
  - Modified RPM for Fedora.