[graphviz/f21: 11/11] Merge remote-tracking branch 'origin/master' into f21

[Jaroslav Škarvada]

commit c9927b158108d90e2e351485530effee6c310211
Merge: f755a22 588da00
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Jan 16 11:28:14 2015 +0100

    Merge remote-tracking branch 'origin/master' into f21

 graphviz-2.38.0-ocaml-fix-ints.patch |   11 ++++++++
 graphviz-2.38.0-vimdot-vi.patch      |   12 +++++++++
 graphviz.spec                        |   45 +++++++++++++++++++++++++---------
 3 files changed, 56 insertions(+), 12 deletions(-)
---