Merge branch 'v0.8'

Conflicts:
	CHANGES.md

CHANGES.md

@@ -105,6 +105,15 @@ Their replacements are listed here:
 -   The internal protocol uses different operands.  "put" is now "set".
     "del" is now "delete".  "view" and "viewInfo" have been removed.
 
+## 0.8.12
+- Treat foreign promises as unresolved in `Q.isFulfilled`; this lets `Q.all`
+  work on arrays containing foreign promises. #154
+- Fix minor incompliances with the [Promises/A+ spec][] and [test suite][]. #157
+  #158
+
+[Promises/A+ spec]: http://promises-aplus.github.com/promises-spec/
+[test suite]: https://github.com/promises-aplus/promises-tests
+
 ## 0.8.11
 
  - Added ``nfcall``, ``nfapply``, and ``nfbind`` as ``thisp``-less versions of

README.md

@@ -1,5 +1,10 @@
 [![Build Status](https://secure.travis-ci.org/kriskowal/q.png)](http://travis-ci.org/kriskowal/q)
 
+<a href="http://promises-aplus.github.com/promises-spec">
+    <img src="http://promises-aplus.github.com/promises-spec/assets/logo-small.png"
+         align="right" alt="Promises/A+ logo" />
+</a>
+
 If a function cannot return a value or throw an exception without
 blocking, it can return a promise instead.  A promise is an object
 that represents the return value or the thrown exception that the

package.json

@@ -1,15 +1,19 @@
 {
     "name": "q",
-    "version": "0.8.11",
+    "version": "0.8.12",
     "description": "A library for promises (CommonJS/Promises/A,B,D)",
     "homepage": "https://github.com/kriskowal/q",
     "author": "Kris Kowal <[email protected]> (https://github.com/kriskowal)",
     "keywords": [
         "q",
         "promise",
+        "promises",
+        "promises-a",
+        "promises-a-plus",
         "deferred",
         "future",
         "async",
+        "flow control",
         "fluent",
         "browser",
         "node"