Merge branch 'hideendpoints' of ssh://github.com/jfinkels/flask-restl…

…ess into hideendpoints

Conflicts:
	CHANGES
	flask_restless/manager.py
	tests/test_manager.py

flask_restless/manager.py

@@ -309,9 +309,6 @@ def create_api_blueprint(self, model, methods=READONLY_METHODS,
         is not read from the post parameters (where malicious user can tamper
         with them) but from the session.
 
-        .. versionadded:: 0.7
-           Added the `exclude_columns` keyword argument.
-
         If `hide_disallowed_endpoints` is ``True``, requests to disallowed
         methods (that is, methods not specified in `methods`), which would
         normally yield a :http:statuscode:`405` response, will yield a
@@ -328,6 +325,9 @@ def create_api_blueprint(self, model, methods=READONLY_METHODS,
            Added the `hide_disallowed_endpoints` and
            `hide_unauthenticated_endpoints` keyword argument.
 
+        .. versionadded:: 0.7
+           Added the `exclude_columns` keyword argument.
+
         .. versionadded:: 0.6
            This functionality was formerly in :meth:`create_api`, but the
            blueprint creation and registration have now been separated.