captainill b98db9ce59 merge with upstream master / fix conflickt in layout		2015-12-20 13:06:30 -08:00
..
docs	Clarify package documentation regarding providers	2015-12-10 12:48:13 -05:00
www	merge with upstream master / fix conflickt in layout	2015-12-20 13:06:30 -08:00