Dmitriy Zaporozhets 92ef845fa5 Merge branch 'master' into 6-0-dev ... Conflicts: VERSION		2013-07-12 16:16:20 +03:00
..
deploy	add deploy recipe extracted from staging server	2013-05-16 12:45:30 +03:00
init.d	Merge branch 'master' into 6-0-dev	2013-07-12 16:16:20 +03:00
nginx	Make the installation guide easier to follow for non-unix people.	2013-06-12 21:30:36 +02:00