3 commits

Author	SHA1	Message	Date
Chris Rebert	a317f67c1c	re-integrate #8560 using @fat's code from the comment on #8614	2013-07-26 01:15:41 -07:00
Chris Rebert	292d8d6819	specify explicit ordering for grunt concat step	2013-07-26 01:07:56 -07:00
John-Philip Johansson	0d33455ef4	Replace Makefile with GruntJS ... A rebase (against soon-to-be 3.0.0-rc.1) & squash of https://github.com/twbs/bootstrap/pull/7786 AKA https://github.com/twitter/bootstrap/pull/7786 originally by @seriema @mokkabonna @jojohess Rebased by @cvrebert	2013-07-26 00:39:14 -07:00