[inxi: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/inxi

[Vasiliy Glazov]

commit 82bd77dd7a76ae90b42c73e45208361b5f4d34b6
Merge: 5c4130f 1b785f2
Author: Vascom <vascom2 at gmail.com>
Date:   Tue Aug 12 09:48:46 2014 +0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/inxi
    
    Conflicts:
    	inxi.spec

 inxi.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc inxi.spec
index ed7a805,2b280b7..2a1d5a1
--- a/inxi.spec
+++ b/inxi.spec
@@@ -50,9 -50,9 +50,12 @@@ install -p -D -m 644 %{name}.1.gz %{bui
  
  
  %changelog
 +* Tue Aug 12 2014 Vasiliy N. Glazov <vascom2 at gmail.com> 2.1.90-1
 +- Update to 2.1.90
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.28-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Tue May 06 2014 Vasiliy N. Glazov <vascom2 at gmail.com> 2.1.28-1
  - Update to 2.1.28