[Commits] [fluid-project/infusion] f2f180: Merge remote-tracking branch 'mike/FLUID-4444'

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion

  Commit: f2f18094eeb6aa02b6ee54b7e594e6af3a3cea0d
      https://github.com/fluid-project/infusion/commit/f2f18094eeb6aa02b6ee54b7e594e6af3a3cea0d
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2011-09-16 (Fri, 16 Sep 2011)

  Changed paths:
    M src/webapp/demos/uploader/html/uploader.html

  Log Message:
  -----------
  Merge remote-tracking branch 'mike/FLUID-4444'

* mike/FLUID-4444:
  FLUID-4444: Moved single file uploader markup out of the "uploader-contents" container so that the markup is never overwritten


  Commit: 0865981395ca55392412b925871fff7c700c2571
      https://github.com/fluid-project/infusion/commit/0865981395ca55392412b925871fff7c700c2571
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2011-09-16 (Fri, 16 Sep 2011)

  Changed paths:
    M src/webapp/demos/uploader/html/uploader.html

  Log Message:
  -----------
  FLUID-4444: white space cleanup

Committing Colin's white space change to clarify the comments in the
demo's template.


Compare: https://github.com/fluid-project/infusion/compare/fd98e24...0865981