[datalog/f17: 5/5] merge

[John D. Ramsdell]

commit fd83fa82bddd51a341d124134a19babc1d6cdf0e
Merge: 3b52d2a 83c1a00
Author: John D. Ramsdell <ramsdell at mitre.org>
Date:   Mon Apr 1 08:06:29 2013 -0400

    merge

 .gitignore   |    1 +
 datalog.spec |   10 ++++++++--
 sources      |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---