better KEY_PREFIX value example
Merge branch 'f_keyprefix'

* f_keyprefix:
  better KEY_PREFIX value example
Revert "working around issue #712"

This reverts commit c4827b9998ee41838fac3c46fb7a0971d97a73b9.
adding test cases for integralByInterval() and integral()
Merge branch 'f_intergralbyinterval'

* f_intergralbyinterval:
  adding test cases for integralByInterval() and integral()
added integralByInterval to js composer
Merge branch 'f_intergralbyinterval'

* f_intergralbyinterval:
  added integralByInterval to js composer
s/KEY_PREFIX/MEMCACHE_KEY_PREFIX/
Merge branch 'f_keyprefix'

* f_keyprefix:
  s/KEY_PREFIX/MEMCACHE_KEY_PREFIX/
fixing tabs in indentation
Merge branch 'f_intergralbyinterval'

* f_intergralbyinterval:
  fixing tabs in indentation
Revert "Patch for the constantLine function"

This reverts commit 1cfe1f49737ab283cb149c3c91c619fc4ed38870.
avoid ZeroDivisionError when graphing only one constantLine() target

without this patch, when graphing a constantLine without other targets
with actual data, the rendering fails with such a stack trace:

Traceback (most recent call last):
  File ".../deps/django/django/core/handlers/base.py", line 111, in get_response
    response = callback(request, *callback_args, **callback_kwargs)
  File ".../webapp/graphite/render/views.py", line 200, in renderView
    image = doImageRender(requestOptions['graphClass'], graphOptions)
  File ".../webapp/graphite/render/views.py", line 408, in doImageRender
    img = graphClass(**graphOptions)
  File ".../webapp/graphite/render/glyph.py", line 195, in __init__
    self.drawGraph(**params)
  File ".../webapp/graphite/render/glyph.py", line 667, in drawGraph
    self.consolidateDataPoints()
  File ".../webapp/graphite/render/glyph.py", line 1010, in consolidateDataPoints
    bestXStep = numberOfPixels / divisor
ZeroDivisionError: float division

Conflicts:
	webapp/graphite/render/functions.py