[java-1.8.0-openjdk: 2/2] Merge remote-tracking branch 'origin/f21'

[jiri vanek]

commit 587d58b9f7d84c9200468c6b7f39d45311aeab2a
Merge: 01fa07c b0d513f
Author: Jiri Vanek <jvanek at redhat.com>
Date:   Thu Aug 14 19:00:42 2014 +0200

    Merge remote-tracking branch 'origin/f21'

 java-1.8.0-openjdk.spec |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)
---