Igor Zhukov 450dc2d537 Merge branch 'master' into message-composer
Conflicts:
	app/js/lib/ng_utils.js
2015-02-05 23:03:04 +03:00
..
2014-12-31 18:14:16 +01:00
2014-12-31 18:14:16 +01:00
2014-12-12 00:51:02 -08:00
2015-01-02 21:28:13 +01:00
2015-02-02 16:37:08 +03:00
2015-02-04 19:21:01 +03:00
2014-12-31 18:14:16 +01:00