Permalink
Commits on Apr 18, 2011
  1. Fixed conflicts. Seriously, stop using master.

    Phil Sturgeon
    Phil Sturgeon committed Apr 18, 2011
  2. Merge branch 'develop'

    Phil Sturgeon
    Phil Sturgeon committed Apr 18, 2011
  3. Merge branch 'release/v1.2-beta1' into develop

    Phil Sturgeon
    Phil Sturgeon committed Apr 18, 2011
  4. Merge branch 'release/v1.2-beta1'

    Phil Sturgeon
    Phil Sturgeon committed Apr 18, 2011
  5. Updated version numbers.

    Phil Sturgeon
    Phil Sturgeon committed Apr 18, 2011
  6. Updated changelog.

    Phil Sturgeon
    Phil Sturgeon committed Apr 18, 2011
Commits on Apr 15, 2011
  1. fixes conflicts again.

    marcoscoelho committed Apr 15, 2011
  2. Added missing blog migraiton.

    Phil Sturgeon authored and marcoscoelho committed Apr 15, 2011
  3. Removed weird tilda file.

    Phil Sturgeon
    Phil Sturgeon committed Apr 15, 2011
  4. Added missing blog migraiton.

    Phil Sturgeon
    Phil Sturgeon committed Apr 15, 2011
  5. Merge branch 'master' of https://github.com/anatolykhelmer/pyrocms in…

    jeroenvdgulik committed Apr 15, 2011
    …to anatolykhelmer-master
  6. fixes typo mistake

    marcoscoelho committed Apr 15, 2011
  7. clean and indent spaces

    marcoscoelho committed Apr 15, 2011