[plantuml/f21: 6/6] Merge branch 'f20' into f21

[Jan Šafránek]

commit 223938cad40a496da4c3464364fe6c3231c06924
Merge: 7c4809f 1bcd91c
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Fri Mar 6 12:15:36 2015 +0100

    Merge branch 'f20' into f21
    
    Conflicts:
    	.gitignore
    	sources

 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --cc .gitignore
index 41c031f,3ba2c9a..439fac5
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,4 @@@
  /plantuml-lgpl-7951.tar.gz
  /plantuml-lgpl-7978.tar.gz
 +/plantuml-lgpl-7992.tar.gz
+ /plantuml-lgpl-8020.tar.gz