mediagoblin.git
12 years agoUpdate version to 0.3.1 final
Will Kahn-Greene [Wed, 22 Aug 2012 22:06:41 +0000 (18:06 -0400)]
Update version to 0.3.1 final

12 years agoFix docs so they pull version from _version.py
Will Kahn-Greene [Wed, 22 Aug 2012 22:04:50 +0000 (18:04 -0400)]
Fix docs so they pull version from _version.py

12 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Wed, 22 Aug 2012 21:54:53 +0000 (16:54 -0500)]
Committing extracted and compiled translations

12 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Wed, 22 Aug 2012 21:54:27 +0000 (16:54 -0500)]
Committing present MediaGoblin translations before pushing extracted messages

12 years agoFix relnotes for 0.3.1.
Will Kahn-Greene [Wed, 22 Aug 2012 21:47:15 +0000 (17:47 -0400)]
Fix relnotes for 0.3.1.

12 years agoRelease notes for 0.3.1
Christopher Allan Webber [Tue, 21 Aug 2012 20:37:16 +0000 (15:37 -0500)]
Release notes for 0.3.1

12 years agoUsing Aleksejrs' improved text for the theming config description
Christopher Allan Webber [Tue, 21 Aug 2012 14:01:05 +0000 (09:01 -0500)]
Using Aleksejrs' improved text for the theming config description

12 years agoReminding people they need to run gmg assetlink and that there's a default theme
Christopher Allan Webber [Tue, 21 Aug 2012 13:40:47 +0000 (08:40 -0500)]
Reminding people they need to run gmg assetlink and that there's a default theme

12 years agoGive a small amount of info on how to set the theme.
Christopher Allan Webber [Tue, 21 Aug 2012 13:33:44 +0000 (08:33 -0500)]
Give a small amount of info on how to set the theme.

12 years agoDocs tweaks
Will Kahn-Greene [Mon, 20 Aug 2012 16:35:35 +0000 (12:35 -0400)]
Docs tweaks

This fixes some minor issues in the documentation.

12 years agoSetting celery and kombu at very specific versions so that doing a fresh install...
Christopher Allan Webber [Mon, 20 Aug 2012 16:04:13 +0000 (11:04 -0500)]
Setting celery and kombu at very specific versions so that doing a fresh install doesn't break

We really ought to get mediagoblin working with the latest packages.

12 years agoUpdated flatpages example in plugins.rst to reflect reality & point to flatpages...
Christopher Allan Webber [Mon, 20 Aug 2012 13:54:09 +0000 (08:54 -0500)]
Updated flatpages example in plugins.rst to reflect reality & point to flatpages docs

12 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Sun, 19 Aug 2012 19:22:45 +0000 (14:22 -0500)]
Committing extracted and compiled translations

12 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Sun, 19 Aug 2012 19:21:46 +0000 (14:21 -0500)]
Committing present MediaGoblin translations before pushing extracted messages

12 years ago./local/ is yet another stupid local-environment thing to .gitignore
Christopher Allan Webber [Sun, 19 Aug 2012 19:17:53 +0000 (14:17 -0500)]
./local/ is yet another stupid local-environment thing to .gitignore

12 years agoMerge remote-tracking branch 'refs/remotes/merge-requests/42'
Christopher Allan Webber [Sun, 19 Aug 2012 17:18:18 +0000 (12:18 -0500)]
Merge remote-tracking branch 'refs/remotes/merge-requests/42'

12 years agoMerge remote-tracking branch 'refs/remotes/merge-requests/40'
Christopher Allan Webber [Sun, 19 Aug 2012 17:14:39 +0000 (12:14 -0500)]
Merge remote-tracking branch 'refs/remotes/merge-requests/40'

12 years agoUncomment plugins section in mediagoblin.ini
Christopher Allan Webber [Sun, 19 Aug 2012 17:00:47 +0000 (12:00 -0500)]
Uncomment plugins section in mediagoblin.ini

12 years agoadd titles to two pages and fix a typo in docs
Aleksej [Sat, 18 Aug 2012 19:31:27 +0000 (23:31 +0400)]
add titles to two pages and fix a typo in docs

12 years agouse YYYY-MM-DD HH:MM 24-hour format on panels
Aleksej [Mon, 13 Aug 2012 18:19:23 +0000 (22:19 +0400)]
use YYYY-MM-DD HH:MM 24-hour format on panels

12 years agoadded title tags to various pages and marked a string translatable
Aleksej [Mon, 13 Aug 2012 16:28:48 +0000 (20:28 +0400)]
added title tags to various pages and marked a string translatable

12 years agoreplaced os.path.split()[0] with os.path.dirname() and corrected a couple of comments
Aleksej [Mon, 13 Aug 2012 12:07:58 +0000 (16:07 +0400)]
replaced os.path.split()[0] with os.path.dirname() and corrected a couple of comments

12 years agoDuplication of rstrip unnecessary in link_assets function
Christopher Allan Webber [Sun, 12 Aug 2012 16:49:14 +0000 (12:49 -0400)]
Duplication of rstrip unnecessary in link_assets function

Thanks for catching AVRS!

12 years agoAudio support now creates OGG instead of WAV
Joar Wandborg [Sat, 11 Aug 2012 23:57:00 +0000 (01:57 +0200)]
Audio support now creates OGG instead of WAV

While creating the spectrogram, and alternative version of the audio
file has been needed. Before this, it has been a WAV format file, the
issue with WAV is that it takes a lot of space. Starting with this it
will be an OGG file.

Rejoice :)

12 years agoChanged <pre> margin to confirm with <p> margins
Joar Wandborg [Tue, 7 Aug 2012 22:22:52 +0000 (00:22 +0200)]
Changed <pre> margin to confirm with <p> margins

12 years agoallow pre+code tags in rendered HTML
Jakob Kramer [Tue, 24 Apr 2012 15:16:31 +0000 (17:16 +0200)]
allow pre+code tags in rendered HTML

12 years agorenamed MARKDOWN_INSTANCE to UNSAFE_...
Jakob Kramer [Sat, 4 Aug 2012 15:51:26 +0000 (17:51 +0200)]
renamed MARKDOWN_INSTANCE to UNSAFE_...

as proposed by Elrond.

Conflicts:
mediagoblin/tools/text.py

Signed-off-by: Joar Wandborg <git@wandborg.com>
12 years agoAdd python language version classifiers
Will Kahn-Greene [Mon, 6 Aug 2012 15:42:15 +0000 (11:42 -0400)]
Add python language version classifiers

12 years agoNon-performance improvements to cloudfiles
Joar Wandborg [Sun, 5 Aug 2012 20:52:30 +0000 (22:52 +0200)]
Non-performance improvements to cloudfiles

Improved documentation and added logging to cloudfiles

12 years agoFixing grammar on telling users to run dbupdate
Christopher Allan Webber [Sun, 5 Aug 2012 15:14:15 +0000 (10:14 -0500)]
Fixing grammar on telling users to run dbupdate

12 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Sun, 5 Aug 2012 15:01:55 +0000 (10:01 -0500)]
Committing extracted and compiled translations

12 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Sun, 5 Aug 2012 15:01:16 +0000 (10:01 -0500)]
Committing present MediaGoblin translations before pushing extracted messages

12 years agoRemoving text on frontpage that suggests we have favorites (we don't)
Christopher Allan Webber [Sat, 4 Aug 2012 16:34:23 +0000 (11:34 -0500)]
Removing text on frontpage that suggests we have favorites (we don't)

12 years agoFixed a UnicodeError in the sql.models.MediaEntry
Joar Wandborg [Fri, 3 Aug 2012 14:02:18 +0000 (16:02 +0200)]
Fixed a UnicodeError in the sql.models.MediaEntry

The __repr__() call would crash the process when it tried to convert an
unicode title to ASCII for terminal/logfile output.

12 years agoAll processing exceptions are now logged
Joar Wandborg [Tue, 31 Jul 2012 23:16:00 +0000 (01:16 +0200)]
All processing exceptions are now logged

All processing exceptions should now be logged, the MediaEntry marked as
failed, the exception re-raised.

12 years agoAdded text-overflow: ellipsis to the media thumbnails
Joar Wandborg [Sat, 28 Jul 2012 19:01:56 +0000 (21:01 +0200)]
Added text-overflow: ellipsis to the media thumbnails

12 years agoCopied base.html to airy and changed the logo
Joar Wandborg [Fri, 27 Jul 2012 23:08:56 +0000 (01:08 +0200)]
Copied base.html to airy and changed the logo

12 years agoReference the new theme aliasing nginx stuff in the theming documentation
Christopher Allan Webber [Fri, 27 Jul 2012 14:02:07 +0000 (09:02 -0500)]
Reference the new theme aliasing nginx stuff in the theming documentation

12 years agoAdd documentation on how to alias your theme static files
Christopher Allan Webber [Fri, 27 Jul 2012 13:45:35 +0000 (08:45 -0500)]
Add documentation on how to alias your theme static files

12 years agoTweak theming docs
Will Kahn-Greene [Fri, 27 Jul 2012 01:33:25 +0000 (21:33 -0400)]
Tweak theming docs

I did a pass on language and more reST formatting. This is a little
cleaner, though there are a couple of parts that feel like they could
use some work.

12 years agoMerge remote-tracking branch 'refs/remotes/gandaro/369-thread-gettext'
Christopher Allan Webber [Thu, 26 Jul 2012 16:09:52 +0000 (11:09 -0500)]
Merge remote-tracking branch 'refs/remotes/gandaro/369-thread-gettext'

12 years agoMerge remote-tracking branch 'refs/remotes/willkg/plugins-infrastructure-rewrite'
Christopher Allan Webber [Thu, 26 Jul 2012 15:46:52 +0000 (10:46 -0500)]
Merge remote-tracking branch 'refs/remotes/willkg/plugins-infrastructure-rewrite'

12 years agoRemoving PIL from the setup.py develop process.
Christopher Allan Webber [Thu, 26 Jul 2012 15:46:10 +0000 (10:46 -0500)]
Removing PIL from the setup.py develop process.

People should use package managers to install PIL.  It's too much of a
mess to install via python packaging.

12 years agoInclude Airy theme by default
Jef van Schendel [Mon, 23 Jul 2012 19:37:56 +0000 (21:37 +0200)]
Include Airy theme by default

12 years agoAdd zoom-in cursor css; small indentation fix
Jef van Schendel [Fri, 20 Jul 2012 22:27:49 +0000 (00:27 +0200)]
Add zoom-in cursor css; small indentation fix

12 years agoEdit comment-notification text
Jef van Schendel [Fri, 20 Jul 2012 20:03:43 +0000 (22:03 +0200)]
Edit comment-notification text

12 years agoInsignificant edits to logo SVG
Jef van Schendel [Fri, 20 Jul 2012 19:06:41 +0000 (21:06 +0200)]
Insignificant edits to logo SVG

12 years agoIncrease Description and Bio textarea height to 100px
Jef van Schendel [Thu, 19 Jul 2012 22:45:49 +0000 (00:45 +0200)]
Increase Description and Bio textarea height to 100px

12 years agomake mg_globals.translations thread-safe
Jakob Kramer [Wed, 18 Jul 2012 17:25:53 +0000 (19:25 +0200)]
make mg_globals.translations thread-safe

I added mg_globals.thread_scope (an instance of threading.local)
and made `translations' an attribute of it.

12 years ago[Issue 466] Implement e-z plugin disabling
Will Kahn-Greene [Wed, 18 Jul 2012 01:14:45 +0000 (21:14 -0400)]
[Issue 466] Implement e-z plugin disabling

12 years agoRework plugin infrastructure to nix side-effects
Will Kahn-Greene [Wed, 18 Jul 2012 01:02:12 +0000 (21:02 -0400)]
Rework plugin infrastructure to nix side-effects

This reworks the plugin infrastructure so as to remove module-loading
side-effects which were making things a pain in the ass to test.

With the new system, there's no auto-registering meta class. Instead
plugins do whatever they want and then specify a hooks dict that maps
hook names to callables for the things they're tying into. The most
common one (and the only one we've implemented so far) is "setup".

This also simplifies the sampleplugin a little by moving the code
to __init__.py.

12 years agoFix themeing docs
Will Kahn-Greene [Mon, 16 Jul 2012 21:06:57 +0000 (17:06 -0400)]
Fix themeing docs

This fixes a bunch of formatting issues in the themeing docs and makes
them easier to read.

12 years agoOverhaul flatpages
Will Kahn-Greene [Thu, 12 Jul 2012 23:18:15 +0000 (19:18 -0400)]
Overhaul flatpages

* move contents of main.py to __init__.py
* update documentation in README
* change the key/value configuration specification
* added a recipe for passing values from the url to the template
* removed some unused code

12 years agoFix template
Will Kahn-Greene [Thu, 12 Jul 2012 22:32:45 +0000 (18:32 -0400)]
Fix template

12 years agoFinish flatpagesplugin; add plugin docs
Will Kahn-Greene [Sun, 10 Jun 2012 18:51:13 +0000 (14:51 -0400)]
Finish flatpagesplugin; add plugin docs

12 years agoFlatpages first pass
Will Kahn-Greene [Sun, 10 Jun 2012 15:50:14 +0000 (11:50 -0400)]
Flatpages first pass

This fixes the template loader so that it can load plugin templates.

This adds code for registering template paths so that plugins can add
their own templates.

This adds the base code for the flatpagesfile plugin. It doesn't serve
pages, yet, but it's pretty close.

12 years agoAdded a section describing how to do theming via simple CSS stuff!
Christopher Allan Webber [Sun, 15 Jul 2012 03:58:42 +0000 (22:58 -0500)]
Added a section describing how to do theming via simple CSS stuff!

12 years agoMoving extrahead.html -> extra_head.html because it's easier to read
Christopher Allan Webber [Sun, 15 Jul 2012 03:52:22 +0000 (22:52 -0500)]
Moving extrahead.html -> extra_head.html because it's easier to read

12 years agoSmall fix to themedata_for_theme_dir utility about sections
Christopher Allan Webber [Sun, 15 Jul 2012 03:44:06 +0000 (22:44 -0500)]
Small fix to themedata_for_theme_dir utility about sections

If we can't find the theme section, we should use a dictionary instead
of None in this section of code.

12 years agoAllow for an "extrahead" template where themers can include extra css, js, etc
Christopher Allan Webber [Sun, 15 Jul 2012 03:43:08 +0000 (22:43 -0500)]
Allow for an "extrahead" template where themers can include extra css, js, etc

12 years agoStore licensing info as well
Christopher Allan Webber [Sun, 15 Jul 2012 01:23:21 +0000 (20:23 -0500)]
Store licensing info as well

12 years agoMostly good theming documentation!
Christopher Allan Webber [Sun, 15 Jul 2012 01:22:25 +0000 (20:22 -0500)]
Mostly good theming documentation!

12 years agoFleshing out theming documentation; wrote out "structure of things" section
Christopher Allan Webber [Sat, 14 Jul 2012 20:54:14 +0000 (15:54 -0500)]
Fleshing out theming documentation; wrote out "structure of things" section

12 years agoSetup the scaffolding for theme installing, but it doesn't work yet
Christopher Allan Webber [Sat, 14 Jul 2012 18:32:11 +0000 (13:32 -0500)]
Setup the scaffolding for theme installing, but it doesn't work yet

12 years agoBreak the asset linking code off into a reusable function
Christopher Allan Webber [Sat, 14 Jul 2012 18:23:12 +0000 (13:23 -0500)]
Break the asset linking code off into a reusable function

In the future, the install command should be able to use that as well.

12 years agoMoving the "dependency injection printer tools" over to tools/common.py
Christopher Allan Webber [Sat, 14 Jul 2012 17:36:40 +0000 (12:36 -0500)]
Moving the "dependency injection printer tools" over to tools/common.py

12 years agoasset linking command now works
Christopher Allan Webber [Fri, 13 Jul 2012 21:08:31 +0000 (16:08 -0500)]
asset linking command now works

12 years agoStart of the `./bin/gmg theme assetlink` command.
Christopher Allan Webber [Fri, 13 Jul 2012 17:36:31 +0000 (12:36 -0500)]
Start of the `./bin/gmg theme assetlink` command.

Mostly works but doesn't handle all the places it could break.

12 years agoMake the theme_linked_assets_dir config option point to the right place by default
Christopher Allan Webber [Fri, 13 Jul 2012 17:35:07 +0000 (12:35 -0500)]
Make the theme_linked_assets_dir config option point to the right place by default

Should be in user_dev...

12 years agoMaking the register_themes() tool also return the current theme
Christopher Allan Webber [Fri, 13 Jul 2012 17:33:52 +0000 (12:33 -0500)]
Making the register_themes() tool also return the current theme

This will reduce the amount of work reproducing this behavior when
pulling together the theme registry elsewhere.

12 years agoServe and setup the mediagoblin "linked theme" assets directory
Christopher Allan Webber [Fri, 6 Jul 2012 22:59:30 +0000 (17:59 -0500)]
Serve and setup the mediagoblin "linked theme" assets directory

12 years agoAdd the theme domain to the application's staticdirector
Christopher Allan Webber [Fri, 6 Jul 2012 22:35:01 +0000 (17:35 -0500)]
Add the theme domain to the application's staticdirector

12 years agoUpdate staticdirect stuff so it can handle "domains" of staticdirection
Christopher Allan Webber [Fri, 6 Jul 2012 19:54:21 +0000 (14:54 -0500)]
Update staticdirect stuff so it can handle "domains" of staticdirection

12 years agoKill MultiRemoteStaticDirect... nobody was really using it anyway
Christopher Allan Webber [Fri, 6 Jul 2012 16:25:42 +0000 (11:25 -0500)]
Kill MultiRemoteStaticDirect... nobody was really using it anyway

Since we're adding the new "domain" staticdirect system we should
clean this up.

12 years agoMoving staticdirect to tools/
Christopher Allan Webber [Fri, 6 Jul 2012 03:12:29 +0000 (22:12 -0500)]
Moving staticdirect to tools/

12 years agoThemes are now registered and can have their templates loaded properly
Christopher Allan Webber [Thu, 5 Jul 2012 17:23:56 +0000 (12:23 -0500)]
Themes are now registered and can have their templates loaded properly

12 years agoEarly version of theme registry code
Christopher Allan Webber [Sat, 30 Jun 2012 22:34:04 +0000 (17:34 -0500)]
Early version of theme registry code

12 years agoremoved _make_safe in favor of functools.wraps
Jakob Kramer [Thu, 12 Jul 2012 13:01:40 +0000 (15:01 +0200)]
removed _make_safe in favor of functools.wraps

12 years agoProcessing panel improvements
Joar Wandborg [Tue, 10 Jul 2012 23:43:21 +0000 (01:43 +0200)]
Processing panel improvements

- Added admin processing panel
- Minor fixes on the user processing panel template

12 years agoPanel improvements
Joar Wandborg [Tue, 10 Jul 2012 22:36:42 +0000 (00:36 +0200)]
Panel improvements

- Added progress meter for video and audio media types.
- Changed the __repr__ method of a MediaEntry to display a bit more
  useful explanation.
- Added a new MediaEntry.state, 'processing', which means that the task
  is running the processor on the item currently.
- Fixed some PEP8 issues in user_pages/views.py
- Fixed the ATOM TAG URI to show the correct year.

12 years agoMinor improvements to the processing panel
Joar Wandborg [Tue, 10 Jul 2012 15:53:37 +0000 (17:53 +0200)]
Minor improvements to the processing panel

- It is now possible to actually see what's processing, due to a bug fix
  where __getitem__ was called on the db model.
- Removed DEPRECATED message from the docstring, it wasn't true.

12 years agoMerge branch 'master' into 201207-testfixes
Brett Smith [Sun, 8 Jul 2012 15:07:02 +0000 (11:07 -0400)]
Merge branch 'master' into 201207-testfixes

12 years agoDrop our scoped session sooner to prevent SQLAlchemy re-binding warnings.
Brett Smith [Sun, 8 Jul 2012 15:00:36 +0000 (11:00 -0400)]
Drop our scoped session sooner to prevent SQLAlchemy re-binding warnings.

12 years agoDon't rely on app_config if common.TESTS_ENABLED.
Brett Smith [Sun, 8 Jul 2012 14:37:33 +0000 (10:37 -0400)]
Don't rely on app_config if common.TESTS_ENABLED.

app_config will be None in this case, so all of these subscripts will
fail.

12 years agoMake filestorage available to code that only imports storage.
Brett Smith [Sun, 8 Jul 2012 14:30:55 +0000 (10:30 -0400)]
Make filestorage available to code that only imports storage.

The storage-related tests were relying on this, if nothing else.

12 years agoPrevent SQLAlchemy non-Unicode warnings from this test.
Brett Smith [Sun, 8 Jul 2012 14:24:57 +0000 (10:24 -0400)]
Prevent SQLAlchemy non-Unicode warnings from this test.

12 years agoPrevent SQLAlchemy non-Unicode warnings in this test.
Brett Smith [Sun, 8 Jul 2012 14:23:02 +0000 (10:23 -0400)]
Prevent SQLAlchemy non-Unicode warnings in this test.

12 years agoMore Unicode titles to prevent non-Unicode SQLAlchemy warnings.
Brett Smith [Sun, 8 Jul 2012 14:18:33 +0000 (10:18 -0400)]
More Unicode titles to prevent non-Unicode SQLAlchemy warnings.

12 years agoFix docstring typo.
Brett Smith [Sun, 8 Jul 2012 14:04:58 +0000 (10:04 -0400)]
Fix docstring typo.

12 years agoPrevent non-Unicode SQLAlchemy warnings in most submission tests.
Brett Smith [Sun, 8 Jul 2012 14:04:06 +0000 (10:04 -0400)]
Prevent non-Unicode SQLAlchemy warnings in most submission tests.

This commit  makes test_submission mostly warning-clean.

12 years agomade the download links consistent
Jakob Kramer [Sat, 7 Jul 2012 19:19:14 +0000 (21:19 +0200)]
made the download links consistent

12 years agoput attachments into sidebar
Jakob Kramer [Sat, 7 Jul 2012 19:37:46 +0000 (21:37 +0200)]
put attachments into sidebar

also added {% trans %} tags

12 years agoAdded API documentation
Joar Wandborg [Sat, 31 Mar 2012 23:21:20 +0000 (01:21 +0200)]
Added API documentation

- Applied the MediaGoblin docs theme to the API docs
- Added api-docs/build to .gitignore
- Configured api-docs/source/conf.py
- Added /api-docs/source/mediagoblin* to .gitignore
- Added apidoc directive to api docs Makefile, will build the API docs
  based on the source

12 years agoDecoding EXIF strings as UTF-8 with replace in the ifd_tag_to_dict
Joar Wandborg [Sat, 7 Jul 2012 18:01:19 +0000 (20:01 +0200)]
Decoding EXIF strings as UTF-8 with replace in the ifd_tag_to_dict
method.

12 years agoUpdated the media types documentation, added steps for audio
Joar Wandborg [Fri, 6 Jul 2012 20:51:49 +0000 (22:51 +0200)]
Updated the media types documentation, added steps for audio

- Added chapter about media type negotiation.
- Added instructions on how to install dependencies for the audio media
  type.
- Moved part about how to enable media types in your config to a single
  place at the top of the document named "Enable Media Types".
- Renamed the "Enable Media Types" page to "Media Types".

12 years agoRemoved .ogg extension from audio MEDIA_MANAGER.
Joar Wandborg [Fri, 6 Jul 2012 20:42:31 +0000 (22:42 +0200)]
Removed .ogg extension from audio MEDIA_MANAGER.

There is some historical controversy about the .ogg extension and what
you should expect from it. It's better to let the audio and video
plugins take the sniffing-based route to find out what it really seems
to be.

12 years agoSwitching the syntax of this exception-raise
Christopher Allan Webber [Fri, 6 Jul 2012 14:06:01 +0000 (09:06 -0500)]
Switching the syntax of this exception-raise

It's nicer to raise exceptions like
  raise Exception("foo")
than
  raise Exception, "foo"

12 years agoRemoving _jointhat()... not really needed.
Christopher Allan Webber [Fri, 6 Jul 2012 14:03:08 +0000 (09:03 -0500)]
Removing _jointhat()... not really needed.

12 years agoone more noSuchFiles->no_such_files
Christopher Allan Webber [Fri, 6 Jul 2012 14:02:24 +0000 (09:02 -0500)]
one more noSuchFiles->no_such_files

12 years agoMerge remote-tracking branch 'refs/remotes/merge-requests/37'
Christopher Allan Webber [Fri, 6 Jul 2012 13:52:35 +0000 (08:52 -0500)]
Merge remote-tracking branch 'refs/remotes/merge-requests/37'