Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 ruby-raa/ruby-1.9/CONFLICTS |    1 +
 ruby-raa/ruby-1.9/HISTORY   |    3 +++
 2 files changed, 4 insertions(+)

New commits:
commit 6f3f960ac598e6de01f6cafff510a4346d037ee9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    ruby-1.9: conflicts rake

diff --git a/ruby-raa/ruby-1.9/CONFLICTS b/ruby-raa/ruby-1.9/CONFLICTS
index 54a7709..ed2b37f 100755
--- a/ruby-raa/ruby-1.9/CONFLICTS
+++ b/ruby-raa/ruby-1.9/CONFLICTS
@@ -5,3 +5,4 @@ conflicts ruby-2.1
 conflicts ruby-2.2
 conflicts ruby-enterprise-edition
 conflicts rubygems
+conflicts rake
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index a2f4720..bcca63c 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,3 +1,6 @@
+2015-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: conflicts with rake
+
 2015-04-01 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: added missing libffi dependency
        * BUILD: removed obsolete pthread flag; force rubygems here