Merge pull request #669 from shoyer/fix-resample-docs

Fix resample docstring

Author: shoyer

xray/core/common.py

@@ -289,7 +289,7 @@ def resample(self, freq, dim, how='mean', skipna=None, closed=None,
             of valid offsets include:
 
             * 'AS': year start
-            * 'Q-DEC': quarter, starting on December 1
+            * 'QS-DEC': quarterly, starting on December 1
             * 'MS': month start
             * 'D': day
             * 'H': hour