Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 crypto/dropbear/CONFLICTS |    1 -
 crypto/dropbear/HISTORY   |    4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 2791e0c0c044264ac78fc00687715faed735e1ad
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    dropbear: Remove conflict with openssh
    
    No conflicting files installed.

diff --git a/crypto/dropbear/CONFLICTS b/crypto/dropbear/CONFLICTS
index ce6d9b6..cac691c 100755
--- a/crypto/dropbear/CONFLICTS
+++ b/crypto/dropbear/CONFLICTS
@@ -1,3 +1,2 @@
-conflicts  openssh  &&
 conflicts  ssh      &&
 conflicts  lsh
diff --git a/crypto/dropbear/HISTORY b/crypto/dropbear/HISTORY
index 300a270..15827e2 100644
--- a/crypto/dropbear/HISTORY
+++ b/crypto/dropbear/HISTORY
@@ -1,3 +1,7 @@
+2012-09-26 Ismael Luceno <ismael.luceno AT gmail.com>
+       * CONLFICTS: remove conflict with openssh, no conflicting files
+         installed.
+
 2010-04-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 0.52