[jansi-native: 2/2] Merge commit '154bb699f693743c066e7912e23a90f65a8eec0b'

[Mikolaj Izdebski]

commit 9e4368e59c24883e1acc3dd2085a334e8e46c44e
Merge: e9331ed 154bb69
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Mar 6 14:59:52 2014 +0100

    Merge commit '154bb699f693743c066e7912e23a90f65a8eec0b'
    
    Conflicts:
    	jansi-native.spec

 jansi-native.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --cc jansi-native.spec
index d861515,6fe1f19..fcc2dea
--- a/jansi-native.spec
+++ b/jansi-native.spec
@@@ -61,9 -62,10 +62,13 @@@ This package contains the API documenta
  %doc license.txt
  
  %changelog
 +* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.5-4
 +- Use Requires: java-headless rebuild (#1067528)
 +
+ * Fri Jan 10 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.5-4
+ - Install attached artifacts
+ - Resolves: rhbz#1028550
+ 
  * Tue Nov 26 2013 Marek Goldmann <mgoldman at redhat.com> - 1.5-3
  - Mark javadoc subpackage as noarch