problem with line endings while commiting
fixing merging
Merge branch 'master' of https://github.com/sunpy/sunpy
Merge branch 'master' of github.com:sunpy/sunpy into masterorigin
Merge branch 'master' of https://github.com/sunpy/sunpy into masterorigin
Merge remote-tracking branch 'upstream/master' into masterorigin
Merge branch 'master' of github.com:sunpy/sunpy into masterorigin
parse_time will propagate down into lists of lists
parse_time will propagate down into nested tuples
Bugfix: added the possibility of long input for seconds past 1979
Revised checking for tuples that are intended as datetime input
Merge pull request #373 from wafels/master

Fix for reading JP2 files
Merge pull request #375 from ayshih/parse_time

Adding functionality to parse_time
Removed NoneType import (Python 3 compat)
Merge pull request #381 from khughitt/master

Python 3.x fix (removed NoneType import)
Adjusted _plot_limb to use the map.center property if defined.
Added draw_limb and draw_grid to compositie map class.
Implemented in such a way that the user selects a map index to use for the
plotting of the limb / grid, whereby it calls the method in that map.
Modified Import Warning for C extension
Remove patches import
Moved the chaincode files from the other branch to ROI directory