From: Marco Baringer <mb@bese.it>
Date: Sat, 9 Feb 2013 11:05:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'cl-fiveam/master'
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=b73b69718c49a7e5c666bab225cc0843d7c7aadb;hp=526421d21a514dfbd190ae5956cbbb95035c0dc2;p=fiveam.git

Merge remote-tracking branch 'cl-fiveam/master'

Conflicts:
	src/test.lisp

Update docstring for 5am:test to point to 5am:def-test
---

diff --git a/src/test.lisp b/src/test.lisp
index e874dc8..b5e590a 100644
--- a/src/test.lisp
+++ b/src/test.lisp
@@ -40,8 +40,7 @@ named KEY in the *TEST* hash table."
         collect test))
 
 (defmacro test (name &body body)
-  "Deprecated. See DEF-TEST."
-  (simple-style-warning "~A is OBSOLETE! Use ~A instead." 'test 'def-test)
+  "Alias for DEF-TEST."
   (destructuring-bind (name &rest args)
       (ensure-list name)
     `(def-test ,name (,@args) ,@body)))