Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

Conflicts:
	fabfile.py

diff --combined fabfile.py
index c06c50b,5f9cd3f..6304aae
--- 1/fabfile.py
--- 2/fabfile.py
+++ b/fabfile.py
@@@ -1,13 -1,14 +1,15 @@@
- from fabric.api import run, local, settings, abort, env, cd, require, abort
+ from __future__ import with_statement
++from fabric.api import *
+ 
 -from fabric.api import run, env, cd
  
  def staging():
 -    '''Add staging server to hosts'''
 +    '''Use staging server'''
      env.hosts = ['platforma@stigma.nowoczesnapolska.org.pl:2222']
      env.project_dir = '/home/platforma/platforma'
  
  def deploy():
      '''Deploy server'''
 +    require('project_dir', provided_by=['staging'])
      with cd(env.project_dir):
          run('git pull')
          run('./project/manage.py syncdb')