[julia: 3/3] Merge branch 'f21'

[Milan Bouchet-Valat]

commit cabd6894f0837a9c9792ade701a7223deb1e4a97
Merge: 182a1be 2be7acb
Author: Milan Bouchet-Valat <nalimilan at club.fr>
Date:   Fri Sep 26 18:35:40 2014 +0200

    Merge branch 'f21'
    
    Conflicts:
    	julia.spec

 julia.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---